Changeset 1071 for MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model

Timestamp:

01/14/11 11:39:19 (13 years ago)

Author:

vronk

Message:

further work on terms/values (layout, behaviour)
fix in repository handling

File:

• MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java (modified) (2 diffs)

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

@@ -328 +328 @@
                 
                 if (type.equals(MODEL)) {
-                        targetRequest = toCMDIndex() + "&maxdepth=" + getMaxdepth()  ; /* + "&maxdepth=" + getMaxdepth() );  "&collection=" + getCollection() + */
+                        targetRequest = fromCMDIndex2Xpath() + "&maxdepth=" + getMaxdepth()  ; /* + "&maxdepth=" + getMaxdepth() );  "&collection=" + getCollection() + */
                 } else if (type.equals(VALUES)) {
-                        targetRequest = toCMDIndex() ; /* + "&maxdepth=" + getMaxdepth() );  "&collection=" + getCollection() + */
+                        targetRequest = fromCMDIndex2Xpath() ; /* + "&maxdepth=" + getMaxdepth() );  "&collection=" + getCollection() + */
                         
                         if (startItem != null) {
@@ -442 +442 @@
         /**
          * if the query is just a path-like structure
-         * "transforms" to cmdIndex-format, means replace('.', '/') ;)
+         * "transforms" the cmdIndex-format to appropriate XPath, means replace('.', '/') ;)
+         * and resolves back possible profile-prefix
          * @return
          */
-        public String toCMDIndex() {    
-                 return query_string.replace('.', '/'); 
+        public String fromCMDIndex2Xpath() {
+                String xpath = "";
+                if (query_string.contains(":")) {
+                        int delim_index = query_string.indexOf(":");
+                        String prefix = query_string.substring(0,delim_index );
+                        Termset res = (Termset) Termset.getTermset(prefix);
+                        String profile_name = res.getAttr("name");
+                        if (profile_name.equals("")) {
+                                xpath=query_string.substring(delim_index); 
+                        } else {
+                                xpath = profile_name + "//" + query_string.substring(delim_index+1);
+                        }
+                                
+                } else {
+                        xpath = query_string; 
+                }
+                                
+                 return xpath.replace('.', '/'); 
         }