Changeset 44

Timestamp:

06/16/09 12:17:10 (16 years ago)

Author:

lgiessmann

Message:

ajax-client: a fragment commit without validation is implemented; json-importer: to import a topic or a topicStub it is necessary to define a psi for this element - this is difference between the xtm-importer \(there must be one of the elements psi, itemidentity, subjectlocator defined\), because all topics are referenced via psis and not topicid\'s

Location:

trunk/src

Files:

• ajax/javascripts/create.js (modified) (4 diffs)
• ajax/javascripts/datamodel.js (modified) (4 diffs)
• ajax/javascripts/requests.js (modified) (2 diffs)
• json/json_importer.lisp (modified) (2 diffs)

trunk/src/ajax/javascripts/create.js ¶

@@ -37 +37 @@
                 }
 
+                items = $$("li." + CLASSES.tmIdFrame());
+                for(var i = 0; i !== items.length; ++i){
+                    items[i].remove();
+                }
+
                 items = $$("li." + CLASSES.commitButton());
                 for(var i = 0; i !== items.length; ++i){
@@ -50 +55 @@
                 context.insert({"after" : liT});
 
-                addTopicAsPlayer((constraints ? constraints.associationsConstraints : null), topic.getContent().instanceOfs);
-                var associations = new AssociationContainerC(null, (constraints ? constraints.associationsConstraints : null));
-                var liA = new Element("li", {"class" : CLASSES.associationContainer()}).update(associations.getFrame());
-                liT.insert({"after" : liA});
+                var liA = null;
+                var associations = null;
+                if(constraints && constraints.associationsConstraints && constraints.associationsConstraints.length !== 0){
+                    addTopicAsPlayer((constraints ? constraints.associationsConstraints : null), topic.getContent().instanceOfs);
+                    associations = new AssociationContainerC(null, (constraints ? constraints.associationsConstraints : null));
+                    liA = new Element("li", {"class" : CLASSES.associationContainer()}).update(associations.getFrame());
+                    liT.insert({"after" : liA});
+                }
+                else {
+                    liA = liT;
+                }
 
                 var tmId = new tmIdC(null);
@@ -61 +73 @@
                 var commitButton = new Element("input", {"type" : "button", "value" : "commit fragment", "style" : "float: right; margin-top: -10px;"})
                 commitButton.observe("click", function(event){
-                    try{
                     var tPsis = topic.getContent().subjectIdentifiers;
-                    var referencedTopics = topic.getReferencedTopics().concat(associations.getReferencedTopics()).without(CURRENT_TOPIC).uniq();
-
+                    var referencedTopics = topic.getReferencedTopics();
+                    if(associations){
+                        referencedTopics = referencedTopics.concat(associations.getReferencedTopics()).without(CURRENT_TOPIC).uniq();
+                    }
+                    
                     function onSuccessHandler(topicStubs){
                         var tsStr = "null";
@@ -77 +91 @@
                         var jTopic = "\"topic\":" + topic.toJSON();
                         var jTopicStubs = "\"topicStubs\":" + tsStr;
-                        var jAssociations = "\"associations\":" + associations.toJSON().gsub(CURRENT_TOPIC_ESCAPED, tPsis)
+                        var jAssociations = "\"associations\":" + (associations ? associations.toJSON().gsub(CURRENT_TOPIC_ESCAPED, tPsis) : "null");
                         var jTmId = "\"tmIds\":" + tmId.toJSON();
                         var json = "{" + jTopic + "," + jTopicStubs + "," + jAssociations + "," + jTmId + "}";
-                        alert(json);
+                        commitFragment(json, function(xhr){ alert("The fragment was committed succesfully!"); }, null);
                     }
-
+                    
                     function onErrorHandler(){
-                        // --- currently there is not neede a special handling for errors
+                        // --- currently there is not needed a special handling for errors
                         // --- occurred during this operation
                     }
-
+                    
                     getTopicStubs(referencedTopics, onSuccessHandler, onErrorHandler);
-                    }catch(err){ alert("test: " + err); }
                 });
                 var liCB = new Element("li", {"class" : CLASSES.commitButton()});

trunk/src/ajax/javascripts/datamodel.js ¶

@@ -651 +651 @@
                                                return new Array();
                                            }
+
+                                           for(var i = 0; i !== values.length; ++i)
+                                               values[i] = new Array(values[i]);
                                            return values;
                                        },
@@ -1487 +1490 @@
                                                    if(scopes){
                                                        for(var j = 0; j !== scopes.length; ++j){
-                                                           if(referencedTopics.indexOf(scopes[j]) === -1) referencedTopics.push(scopes[j]);
+                                                           if(referencedTopics.indexOf(scopes[j][0]) === -1) referencedTopics.push(scopes[j][0]);
                                                        }
                                                    }
@@ -1503 +1506 @@
                                                    if(scopes){
                                                        for(var j = 0; j !== scopes.length; ++j){
-                                                           if(referencedTopics.indexOf(scopes[j]) === -1) referencedTopics.push(scopes[j]);
+                                                           if(referencedTopics.indexOf(scopes[j][0]) === -1) referencedTopics.push(scopes[j][0]);
                                                        }
                                                    }
@@ -2462 +2465 @@
                                                                   if(scopes){
                                                                       for(var j = 0; j !== scopes.length; ++j){
-                                                                          if(referencedTopics.indexOf(scopes[j]) === -1) referencedTopics.push(scopes[j]);
+                                                                          if(referencedTopics.indexOf(scopes[j][0]) === -1) referencedTopics.push(scopes[j][0]);
                                                                       }
                                                                   }

trunk/src/ajax/javascripts/requests.js ¶

@@ -90 +90 @@
             var delta = 100;
             neededTime += delta;
-            if(delta > maxTimeout){
+            if(delta > maxTimeout && psis && psis.length !== 0){
                 alert("From getTopicStubs(): Please check your network-connection - the request timed out!!!");
                 onFailureHandler();
@@ -107 +107 @@
     }
 }
+
+
+function commitFragment(json, onSuccessHandler, onFailureHandler)
+{
+    if(!json || !onSuccessHandler) throw "From commitFragment(): json and onSuccessHandler must be set!";
+    try{
+        var onFailure = onFailureHandler ? onFailureHandler : defaultFailureHandler;
+        
+        new Ajax.Request(COMMIT_URL, {
+            "method" : "post",
+            "postBody" : json,
+            "onSuccess" : onSuccessHandler,
+            "onFailure" : onFailure});
+    }
+    catch(err){
+        alert("From commitFragment(): " + err);
+    }
+}

trunk/src/json/json_importer.lisp ¶

@@ -392 +392 @@
                (error "json-importer:get-topicStub-values-from-json-string:
                        bad item-specifier found in json-list"))))
-       (unless (or itemIdentities subjectLocators subjectIdentifiers)
-        (error "json-importer:get-topicStub-values-from-json-string: one of the elements
-                  itemIdentity, sbjectLocator or subjectIdentifier must be set"))
+       (unless subjectIdentifiers
+        (error "json-importer:get-topicStub-values-from-json-string: the element subjectIdentifiers mus be set!"))
       (unless id
         (error "json-importer:get-topic-valuesStub-from-json-string: the element id must be set"))
@@ -434 +433 @@
                (error "json-importer:get-topic-values-from-json-string:
                        bad item-specifier found in json-list ~a" (car j-elem)))))
-      (unless (or itemIdentities subjectLocators subjectIdentifiers)
-        (error "json-importer:get-topic-values-from-json-string: one of the elements
-                  itemIdentity, sbjectLocator or subjectIdentifier must be set"))
+      (unless subjectIdentifiers
+        (error "json-importer:get-topic-values-from-json-string: the element subjectIdentifiers must be set!"))
       (unless id
         (error "json-importer:get-topic-values-from-json-string: the element id must be set"))