Changeset 1874

Timestamp:

04/11/12 21:55:31 (12 years ago)

Author:

gaba

Message:

valuse - autocomplete

Location:

MDService2/branches/MDService_simple3

Files:

• WebContent/scripts/mdservice_searchclause.js (modified) (4 diffs)
• WebContent/scripts/mdservice_ui_settings.js (modified) (1 diff)
• WorkspaceProfile.xml (modified) (1 diff)
• src/eu/clarin/cmdi/mdservice/proxy/FCSProxy.java (modified) (1 diff)

MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_searchclause.js

@@ -765 +765 @@
                         var termset = "";
                         if (termsetitem != null) termset = termsetitem.key;
-                        searchclauseset.searchclauses[i][j].index = termset + ":" +  e.value;
+                        var str = e.id;
+                        str = str.substring(str.lastIndexOf('/')+1, str.length);
+                        var termsetindex = termset + ":" +  str;
+                        searchclauseset.searchclauses[i][j].index = termsetindex;
                         
                         //handleTermsSelection(i,j,sValue);     
                         //find element value
-                        /*
+                
                         var index;
                         $.each(element_autocomplete,function(i, item){
-                                if (this.key == elem.key){
+                                if (this.key == termset){
                                         index = i;
                                         return;
@@ -778 +781 @@
                         });
                         var term_index;
-                        $.each(element_autocomplete[index],function(i, item){
-                                if (this.key == e.key){
+                        
+                        $.each(element_autocomplete[index].data,function(i, item){
+                                if (this.id == e.id){
                                         term_index = i;
                                         return;
@@ -785 +789 @@
                         });
                         if (element_autocomplete[index].data[term_index].values.length == 0){
-                        jQuery.get(link('fcs','?operation=scan&scanClause=' + e.value),function(data){
-                                $(data).find('sru:term').each(function(i){
-                                        element_autocomplete[index].data[term_index].values[i] = {label:$(this).find('sru:value').text()};
+                        jQuery.get(link('fcs','?operation=scan&scanClause=' + termsetindex + '&x-context=clarin.eu:mdrepo'),function(data){
+                                $(data).find("sru\\:term").each(function(i){
+                                        element_autocomplete[index].data[term_index].values[i] = {label:$(this).find('sru\\:value').text()};
                                 });
                                 initValueAutocomplete(i,j, index, term_index);
@@ -794 +798 @@
                                 initValueAutocomplete(i,j, index, term_index);
                         }
-                        */
+                        
                         
 }

MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui_settings.js

@@ -68 +68 @@
                 smc: {
                                         base_uri: "/MDService2/smc/"
-                                }        
+                                },
+                fcs: {
+                                        base_uri: "/MDService2/fcs"
+                                }       
 
         };

MDService2/branches/MDService_simple3/WorkspaceProfile.xml

@@ -7 +7 @@
       <WorkspaceProfile user="server">
       <Repositories>
+      <item>
+           <name>clarin.at-mirror</name>   
+           <id>52</id> 
+           <type>md</type>
+           <uri>http://clarin.aac.ac.at/exist/rest/db/clarin/cmd-model.xql/</uri>
+        </item> 
     <item>
               <name>clarin.eu:mdrepo</name>

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/FCSProxy.java

@@ -47 +47 @@
                         getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "query");
                 }
+                
                 if (getParam("scanClause").equals("") && getParam("operation").equals("scan")) {
                         getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "scan");