Author: dward
Date: 2007-11-07 18:33:23 +0100 (Wed, 07 Nov 2007)
New Revision: 5703

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/metadata/MetadataEdit.java
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
Log:
- CURRIKI-1075
  - Return 0 results when bad syntax in query
- CURRIKI-1100
  - Added instructional component to first step.

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/metadata/MetadataEdit.java
===================================================================
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/metadata/MetadataEdit.java
    2007-11-07 17:15:04 UTC (rev 5702)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/metadata/MetadataEdit.java
    2007-11-07 17:33:23 UTC (rev 5703)
@@ -223,7 +223,7 @@
         hPanel.setCellWidth(hPanel.getWidget(1), "50%");
         panelStep1.add(hPanel);
 
-        addEditor(assetObj, Constants.ASSET_INSTRUCTIONAL_COMPONENT_PROPERTY, 
Constants.ASSET_INSTRUCTIONAL_COMPONENT_PROPERTY, panelStep1, true, fullMode);
+        addEditor(assetObj, Constants.ASSET_INSTRUCTIONAL_COMPONENT_PROPERTY, 
Constants.ASSET_INSTRUCTIONAL_COMPONENT_PROPERTY, panelStep1, true, true);
 
         panel.add(panelStep1);
 

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
===================================================================
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
       2007-11-07 17:15:04 UTC (rev 5702)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
       2007-11-07 17:33:23 UTC (rev 5703)
@@ -1578,11 +1578,17 @@
                 throw new Exception("ERROR: Could not load Lucene plugin.");
             } else {
                 // Need to add sorting
-                SearchResults search = lucene.getSearchResults(terms, sortBy, 
"default,en");
+                SearchResults search;
+                try {
+                    search = lucene.getSearchResults(terms, sortBy, 
"default,en");
+                } catch (Exception e){
+                   search = null;
+                }
 
                 if (search == null){
                     // Get search results didn't work for some reason
-                    throw new Exception("ERROR: Lucene search failed (terms: 
"+terms+")");
+                    //throw new Exception("ERROR: Lucene search failed (terms: 
"+terms+")");
+                    docs.add(Integer.valueOf(0));
                 } else {
                     List results = search.getResults(start, nb);
 

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to