Changeset 1046 for MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice

Timestamp:

01/09/11 20:33:19 (13 years ago)

Author:

vronk

Message:

introducing first version of /values (using mdrepo:scanIndex),
other minor fixes

Location:

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice

Files:

• action/CompRegistryProxyAction.java (modified) (1 diff)
• action/GenericProxyAction.java (modified) (4 diffs)
• action/MDRepoProxyAction.java (modified) (2 diffs)
• model/Query.java (modified) (6 diffs)

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/CompRegistryProxyAction.java

@@ -79 +79 @@
                 key +="//-" ;
                 
-                if (getStartRecord()!=null) {
-                        key += getStartRecord() + "//-";
+                if (getStartItem()!=null) {
+                        key += getStartItem() + "//-";
                 }
                         else{
                                 key +="//-" ;
                 }
-                if (getMaximumRecords()!=null) {
-                        key += getMaximumRecords() + "//-";
+                if (getMaximumItems()!=null) {
+                        key += getMaximumItems() + "//-";
                 }
                 else{

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java

@@ -51 +51 @@
         private String collection;
         private String columns;
-        private String startRecord;
-        private String maximumRecords;
+        private String startItem;
+        private String maximumItems;
+        private String sort;
         private String lang="en";
-        private int maxdepth;
+        private int maxdepth;   
         private String format;
         private String options;
@@ -184 +185 @@
 
         
-        public String getStartRecord() {
-                return startRecord;
-        }
-
-        public void setStartRecord(String startRecord) {
-                this.startRecord = startRecord;
-        }
-
-        public String getMaximumRecords() {
-                return maximumRecords;
-        }
-
-        public void setMaximumRecords(String maximumRecords) {
-                this.maximumRecords = maximumRecords;
-        }
-        
+        public String getStartItem() {
+                return startItem;
+        }
+
+        public void setStartItem(String startItem) {
+                this.startItem = startItem;
+        }
+
+        public String getMaximumItems() {
+                return maximumItems;
+        }
+
+        public void setMaximumItems(String maximumItems) {
+                this.maximumItems = maximumItems;
+        }
+        
+
+        public String getSort() {
+                return sort;
+        }
+
+        public void setSort(String sort) {
+                this.sort = sort;
+        }
 
         public String getLang() {
@@ -333 +342 @@
                                 key +="//-" ;
                         }
-                        if (getStartRecord()!=null) {
-                                key += getStartRecord() + "//-";
+                        if (getStartItem()!=null) {
+                                key += getStartItem() + "//-";
                         }
                                 else{
                                         key +="//-" ;
                         }
-                        if (getMaximumRecords()!=null) {
-                                key += getMaximumRecords() + "//-";
+                        if (getMaximumItems()!=null) {
+                                key += getMaximumItems() + "//-";
                         }
                         else{
@@ -486 +495 @@
                         hm.put("cols", getColumns());
                 }
-                if (getStartRecord() != null){
-                        hm.put("startRecord", getStartRecord());
-                }
-                if (getMaximumRecords() != null){
-                        hm.put("maximumRecords", getMaximumRecords());  
+                if (getStartItem() != null){
+                        hm.put("startItem", getStartItem());
+                }
+                if (getMaximumItems() != null){
+                        hm.put("maximumItems", getMaximumItems());      
                 }
                 if (getLang() != null){

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/MDRepoProxyAction.java

@@ -64 +64 @@
          static
          {       urls.put("collection", "?operation=getCollections&collection=");
-                 urls.put("model", "?q=");
+                 urls.put("model", "?operation=queryModel&q=");
+                 urls.put("values", "?operation=scanIndex&q=");
                  urls.put("recordset", "?operation=searchRetrieve&query=");
                  urls.put("record", "?operation=searchRetrieve&query=");
@@ -113 +114 @@
                         query.setCollection(getCollection());
                         query.setColumns(getColumns());
-                        query.setMaximumRecords(getMaximumRecords());
-                        query.setStartRecord(getStartRecord());
+                        query.setMaximumItems(getMaximumItems());
+                        query.setStartItem(getStartItem());
                         query.setOptions(getOptions());
+                        query.setSort(getSort());
                         //Admin.notifyUser("MDRPA.records:" + query.getStartRecord());
                         //Admin.notifyUser("MDRPA.records:" + query.getMaximumRecords());

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java

@@ -30 +30 @@
         public static String COLUMNS = "columns";
         public static String MODEL = "model";
+        public static String VALUES = "values";
         public static String RECORDSET = "recordset";
         public static String RECORD = "record";
         
         public static String PARSED = "parsed";
+        public static String UNPARSED = "unparsed";
         public static String PARSEERROR = "parseerror";
         
@@ -55 +57 @@
         private String collection="";
         private String columns="Id,name";
-        private String startRecord = "1";
-        private String maximumRecords = "50";
+        private String startItem = "1";
+        private String maximumItems = "50";
         private String squery = null;
         private String options = null;
+        private String sort;
         private int maxdepth=1;
         
@@ -119 +122 @@
                         return Query.PARSEERROR;
                 } else {
-                        return Query.PARSED;
+                        return Query.UNPARSED;
                 }
                 
@@ -208 +211 @@
         }
 
-        public String getStartRecord() {
-                return startRecord;
-        }
-        
-        public void setStartRecord(String startRecord) {
-                if (startRecord!=null) {
-                        this.startRecord = startRecord;
-                }
-        }
-        
-        public String getMaximumRecords() {
-                return maximumRecords;
-        }
-        
-        public void setMaximumRecords(String maximumRecords) {
-                if (maximumRecords!=null) {
-                        this.maximumRecords = maximumRecords;
+        public String getSort() {
+                return sort;
+        }
+
+        public void setSort(String sort) {
+                this.sort = sort;
+        }
+
+        public String getStartItem() {
+                return startItem;
+        }
+        
+        public void setStartItem(String startItem) {
+                if (startItem!=null) {
+                        this.startItem = startItem;
+                }
+        }
+        
+        public String getMaximumItems() {
+                return maximumItems;
+        }
+        
+        public void setMaximumItems(String maximumItems) {
+                if (maximumItems!=null) {
+                        this.maximumItems = maximumItems;
                 }
         }
@@ -318 +329 @@
                 if (type.equals(MODEL)) {
                         targetRequest = toCMDIndex() + "&maxdepth=" + getMaxdepth()  ; /* + "&maxdepth=" + getMaxdepth() );  "&collection=" + getCollection() + */
+                } else if (type.equals(VALUES)) {
+                        targetRequest = toCMDIndex() ; /* + "&maxdepth=" + getMaxdepth() );  "&collection=" + getCollection() + */
+                        
+                        if (startItem != null) {
+                                targetRequest = targetRequest +  "&startItem=" + getStartItem();
+                        }
+                        if (maximumItems != null) {
+                                targetRequest = targetRequest +  "&maxItems=" + getMaximumItems();
+                        }
+                        if (sort != null) {
+                                targetRequest = targetRequest +  "&sort=" + getSort();
+                        }
+                        
                 } else if (type.equals(RECORD)) {
                         //  2010-07-11 this is just a hack, because url-encoding the handle acted strange
@@ -332 +356 @@
                                 targetRequest = toXPath() + "&collection=" + getCollection();   
                         }
-                        if ((startRecord != null) && (maximumRecords != null)) {
-                                targetRequest = targetRequest +  "&startRecord=" + getStartRecord() + "&iend=" + getMaximumRecords();
+                        if (startItem != null) {
+                                targetRequest = targetRequest +  "&startItem=" + getStartItem();
+                        }
+                        if (maximumItems != null) {
+                                targetRequest = targetRequest +  "&maxItems=" + getMaximumItems();
                         }
                         if ((options != null)) {