Changeset 1584 for MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui_load.js

Timestamp:

10/20/11 22:32:36 (13 years ago)

Author:

gaba

Message:

squery remove changes

File:

• MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui_load.js (modified) (5 diffs)

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

@@ -55 +55 @@
  
 
-        
-        // USER WORKSPACEPROFILE
-        jQuery.getJSON("/MDService2/workspaceprofile/json/user",function(data){
-                notifyUser(data['WorkspaceProfile'],'debug');
-                                workspace.user_json  = preprocessJSON(data);
+        // server profile first - options needed
+        jQuery.getJSON("/MDService2/workspaceprofile/json/server",function(sdata){
+                                //notifyUser(sdata['WorkspaceProfile'],'debug');
+                                var json = preprocessJSON(sdata);
+                                workspace.server_json = json;
+                                $("#serverqs").attr("data",JSON.stringify(json));
+                                loadQuerysets("server");
+                                loadRepositories(workspace.server_json["WorkspaceProfile"]["Repositories"]);
+                                loadCollections(true);                          
+                                loadTerms();
+                                loadTermsAutocomplete();
+                                loadQueryFromUriParams();
+                                createTooltip(null);
                                 
-                                jQuery.getJSON("/MDService2/workspaceprofile/json/server",function(data){
-                                        notifyUser(data['WorkspaceProfile'],'debug');
-                                                        var json = preprocessJSON(data);
-                                                        workspace.server_json = json;
-                                                        $("#serverqs").attr("data",JSON.stringify(json));
-                                                        //loadQuerysets(json["WorkspaceProfile"]["Querysets"],"server");
-                                                        loadQuerysets("server");
-                                                        loadRepositories(json["WorkspaceProfile"]["Repositories"]);
-                                                        loadCollections(true);                          
-                                                        loadTerms();
-                                                        loadTermsAutocomplete();
-                                                        loadQueryFromUriParams();
-                                                        createTooltip(null);
-                                                        
-                                                        
-                                        });
-
-                                //loadQuerysets(workspace.user_json["WorkspaceProfile"]["Querysets"],"user");
-                                loadQuerysets("user");
-                                loadBookmarksets();
-                                //loadTermsets(jsonw["WorkspaceProfile"]["CustomTermsets"]);
-                                createTooltip(this);
-        });
+                                // USER WORKSPACEPROFILE
+                                jQuery.getJSON("/MDService2/workspaceprofile/json/user",function(data){
+                                                        notifyUser(data['WorkspaceProfile'],'debug');
+                                                        workspace.user_json  = preprocessJSON(data);
+                                                        loadQuerysets("user");
+                                                        loadBookmarksets();
+                                                        createTooltip(this);
+                                });
+                                
+                });
+        
         
         
@@ -279 +275 @@
                 timestr = json.time;
         }
-        var squery = json.squerystring;
-        if (squery = "[NULL]"){
-                squery = "";
-        }
         var qq = json.querystring;
-        if (qq = "[NULL]"){
+        if (qq == "[NULL]"){
                 qq = "";
         }
@@ -292 +284 @@
         '<span class="cmd cmd_publish"></span><div class="detail" >' +
         name +
-        '<div class="cmds-elem-prop"><span class="label">squery:</span><span class="value">' + squery + '</span></div>' +
         '<div class="cmds-elem-prop"><span class="label">query:</span><span class="value">' + Query.simplequerystring(qq) + '</span></div>' + 
         '<div class="cmds-elem-prop"><span class="label">collections:</span><span class="value">' + Query.collectiontext(json) + '</span></div>' +
@@ -307 +298 @@
         $(qs).append(x);
         
-        var query = new Query([],"","","");
+        var query = new Query([],"","");
         query.load(json);
         $(qs).find("[href='"+ id + "_" + i + "']").closest('.cmds-elem-plus').data('query',query);
@@ -450 +441 @@
         $(bs).append(x);
         
-        var query = new Query([],"","","");
+        var query = new Query([],"","");
         query.load(json);
         $(bs).find("[href='"+ id + "_" + i + "']").closest('.cmds-elem-plus').data('query',query);