You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by ps...@apache.org on 2012/02/21 12:21:06 UTC
svn commit: r1291710 -
/incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java
Author: psharples
Date: Tue Feb 21 11:21:06 2012
New Revision: 1291710
URL: http://svn.apache.org/viewvc?rev=1291710&view=rev
Log:
Added a check to also try and find a widget instance by its guid, given the string passed in the url (/wookie/widgets/*)
Modified:
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java
Modified: incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java?rev=1291710&r1=1291709&r2=1291710&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java Tue Feb 21 11:21:06 2012
@@ -16,6 +16,8 @@ package org.apache.wookie.controller;
import java.io.File;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.util.List;
import javax.servlet.ServletException;
@@ -82,10 +84,13 @@ public class WidgetsController extends C
index(resourceId, request, response);
return;
}
- // attempt to get specific widget by id
IPersistenceManager persistenceManager = PersistenceManagerFactory.getPersistenceManager();
- IWidget widget = persistenceManager.findById(IWidget.class, resourceId);
-
+ IWidget widget = persistenceManager.findWidgetByGuid(parseForGuid(request));
+ // attempt to get specific widget by id
+ if (widget == null) {
+ persistenceManager = PersistenceManagerFactory.getPersistenceManager();
+ widget = persistenceManager.findById(IWidget.class, resourceId);
+ }
// return widget result
if (widget == null) throw new ResourceNotFoundException();
returnXml(WidgetHelper.createXMLWidgetsDocument(widget, getLocalPath(request), getLocales(request)),response);
@@ -229,5 +234,24 @@ public class WidgetsController extends C
return false;
}
}
+
+ /**
+ * Tries to obtain the guid of a widget from the path given
+ * by stripping out the '/wookie/widgets/' string at the beginning
+ * @param request
+ * @return a string guid or null if not found
+ */
+ private String parseForGuid(HttpServletRequest request){
+ try {
+ String path = URLDecoder.decode(request.getRequestURI(), "UTF-8");
+ // note the context name may not always be /wookie, so we check the context path
+ if(path != null && path.length() > request.getContextPath().length() + 9){
+ return path.substring(request.getContextPath().length() + 9, path.length());
+ }
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException("Server must support UTF-8 encoding", e);
+ }
+ return null;
+ }
}