Changeset 28030

Timestamp:

2013-08-13T13:28:10+12:00 (11 years ago)

Author:

kjdon

Message:

adding in sort order option

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/SharedSoleneGS2FieldSearch.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/SharedSoleneGS2FieldSearch.java

@@ -33 +33 @@
 public abstract class SharedSoleneGS2FieldSearch extends AbstractGS2FieldSearch
 {
-    protected static final String RANK_PARAM_RANK_VALUE = "rank";
+  //  protected static final String RANK_PARAM_RANK_VALUE = "rank";
   protected static final String SORT_ELEM = "sort";
+  protected static final String SORT_ORDER_PARAM = "sortOrder";
+  protected static final String SORT_ORDER_DESCENDING = "1";
+  protected static final String SORT_ORDER_ASCENDING = "0";
 
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.SharedSoleneGS2FieldSearch.class.getName());
@@ -101 +104 @@
         /** Lucene's/Solr's rank (sort) param is based on sort fields, not ranked/not */
         createParameter(RANK_PARAM, param_list, lang);
+        createParameter(SORT_ORDER_PARAM, param_list, lang);
     }
 
@@ -112 +116 @@
             // get the fields
             ArrayList<String> fields = new ArrayList<String>();
-            //fields.add(RANK_PARAM_RANK_VALUE);
             ArrayList<String> field_names = new ArrayList<String>();
-            //field_names.add(getTextString("param.sortBy.rank", lang));
             if (getSortData(fields, field_names, lang)) {
 
               param = GSXML.createParameterDescription2(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, fields.get(0), fields, field_names);
             }
-        }
+        } else if (name.equals(SORT_ORDER_PARAM)) {
+        String[] vals = { SORT_ORDER_ASCENDING, SORT_ORDER_DESCENDING };
+        String[] vals_texts = { getTextString("param." + SORT_ORDER_PARAM + "." + SORT_ORDER_ASCENDING, lang), getTextString("param." + SORT_ORDER_PARAM + "." + SORT_ORDER_DESCENDING, lang) };
+
+        param = GSXML.createParameterDescription(this.doc, SORT_ORDER_PARAM, getTextString("param." + SORT_ORDER_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, SORT_ORDER_ASCENDING, vals, vals_texts);
+      }
+
         if (param != null)
         {
@@ -157 +165 @@
     return true;
   }
-    protected void getSortByIndexData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang)
-    {
-        // the index info -
-        Element index_list = (Element) GSXML.getChildByTagName(this.config_info, INDEX_ELEM + GSXML.LIST_MODIFIER);
-        NodeList indexes = index_list.getElementsByTagName(INDEX_ELEM);
-        int len = indexes.getLength();
-        // now add even if there is only one
-        for (int i = 0; i < len; i++)
-        {
-            Element index = (Element) indexes.item(i);
-            String shortname = index.getAttribute(GSXML.SHORTNAME_ATT);
-            if (shortname.equals("") || shortname.equals("ZZ") || shortname.equals("TX"))
-            {
-                continue;
-            }
-            index_ids.add("by" + shortname);
-            String display_name = GSXML.getDisplayText(index, GSXML.DISPLAY_TEXT_NAME, lang, "en");
-            if (display_name.equals(""))
-            {
-                display_name = index.getAttribute(GSXML.NAME_ATT);
-                if (display_name.equals(""))
-                {
-                    display_name = shortname;
-                }
-            }
-            index_names.add(display_name);
-
-        }
-
-    }
 
     protected String addFieldInfo(String query, String field)