Changeset 327

Timestamp:

10/14/10 16:07:24 (15 years ago)

Author:

lgiessmann

Message:

adapted the "mark-as-deleted" functions of the UI to the latest update of the backend; fixed a bug in "json_tmcl_validation" when iterating marked-as-deleted assocations; fixed a bug in the UI that appeared after committing delete-messages to the backend --> ticket #74

Location:

trunk/src

Files:

• ajax/javascripts/datamodel.js (modified) (2 diffs)
• ajax/javascripts/requests.js (modified) (2 diffs)
• json/json_tmcl_validation.lisp (modified) (6 diffs)
• model/datamodel.lisp (modified) (1 diff)
• rest_interface/set-up-json-interface.lisp (modified) (1 diff)

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

@@ -4356 +4356 @@
        && type !== "Topic" && type !== "Association"){
         throw "From makeRemoveObject(): type must be: \"Occurrence\" || \"Name\" " +
-            "|| \"Variant\" || \"Topic\" || \"Association\" but is " + type;
+            "|| \"Topic\" but is " + type;
     }
     if (!objectToDelete){
@@ -4362 +4362 @@
     }
 
-    var parentTopic = "null";
-    if(type === "Occurrence" || type === "Name"){
-        var psiFrame = objectToDelete.getFrame().parentNode.parentNode.parentNode.parentNode.select("tr." + CLASSES.subjectIdentifierFrame())[0];
+    // --- Returns a JSON-object that corresponds to a topicStub
+    function makeJsonTopicStub(topicFrame){
+        var topPSIs = "null";
+        var psiFrame = topicFrame.select("tr." + CLASSES.subjectIdentifierFrame())[0];
         var psiFields = psiFrame.select("input");
-        for(i = 0; psiFields && i !== psiFields.length; ++i){
+        for(var i = 0; psiFields && i !== psiFields.length; ++i){
             var psiValue = psiFields[i].value;
             if(psiValue.strip().length !== 0){
-                parentTopic = psiValue.strip().toJSON();
+                topPSIs = new Array(psiValue.strip()).toJSON();
                 break;
             }
         }
-    }
-
-    var topics = "null";
-    if (type === "Topic"){
-        var psiFrame = objectToDelete.getFrame().select("tr." + CLASSES.subjectIdentifierFrame())[0];
-        var psiFields = psiFrame.select("input");
-        for(i = 0; psiFields && i !== psiFields.length; ++i){
-            var psiValue = psiFields[i].value;
-            if(psiValue.strip().length !== 0){
-                topics = new Array(psiValue.strip()).toJSON();
+        var topIIs = "null";
+        var iiFrame = topicFrame.select("tr." + CLASSES.itemIdentityFrame())[0];
+        var iiFields = iiFrame.select("input");
+        for(var i = 0; iiFields && i !== iiFields.length; ++i){
+            var iiValue = iiFields[i].value;
+            if(iiValue.strip().length !== 0){
+                topIIs = new Array(iiValue.strip()).toJSON();
                 break;
             }
         }
+        var topSLs = "null";
+        var slFrame = topicFrame.select("tr." + CLASSES.subjectLocatorFrame())[0];
+        var slFields = slFrame.select("input");
+        for(var i = 0; slFields && i !== slFields.length; ++i){
+            var slValue = slFields[i].value;
+            if(slValue.strip().length !== 0){
+                topSLs = new Array(slValue.strip()).toJSON();
+                break;
+            }
+        }
+        return "{\"id\":\"null\",\"itemIdentities\":" + topIIs +
+               ",\"subjectLocators\":" + topSLs + ",\"subjectIdentifiers\":" + topPSIs +
+               ",\"instanceOfs\":\"null\",\"names\":\"null\",\"occurrences\":\"null\"}";
     }
 
-    var deletedObjects = null;
-    if(type === "Topic"){ deletedObjects = topics; }
-    else { deletedObjects = "[" + objectToDelete.toJSON() + "]"; }
-
-    var jsonData = "{\"type\":\"" + type + "\"," +
-                    "\"topics\":" + topics + "," +
-                    "\"associations\":" + "null" + "," +
-                    "\"parentTopic\":" + parentTopic + "," +
-                    "\"parentName\":" + "null" + "," +
-                    "\"names\":" + (type === "Name" ? deletedObjects : "null") + "," +
-                    "\"variants\":" + "null" + "," +
-                    "\"occurrences\":" + (type === "Occurrence" ? deletedObjects : "null") + "," +
-                    "\"parentAssociation\":" + "null" + "," +
-                    "\"roles\":" + "null" + "}";
+    var delMessage = "null";
+
+    switch(type){
+    case "Topic":
+        delMessage = "{\"type\":\"Topic\",\"delete\":" + makeJsonTopicStub(objectToDelete.getFrame()) + "}";
+        break;
+    case "Name":
+    case "Occurrence":
+        delMessage = "{\"type\":\"" + type + "\",\"parent\":" +
+                     makeJsonTopicStub(objectToDelete.getFrame().parentNode.parentNode.parentNode.parentNode) +
+                     ",\"delete\":" + objectToDelete.toJSON() + "}";
+        break;
+    }
  
-    commitDeletedObject(jsonData, function(xhr){
+    commitDeletedObject(delMessage, function(xhr){
             alert("Objected deleted");
             if(type === "Topic"){
                 $(CLASSES.subPage()).update();
-                makeHome();
+                setNaviClasses($(PAGES.home));
+                makePage(PAGES.home, "");
             }
             else if (type === "Occurrence" || type === "Name"){

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

@@ -220 +220 @@
 
 
-// --- Sends a POST-Message to the server. The sent message enables the server
+// --- Sends a DELETE-Message to the server. The sent message enables the server
 // --- to find the spcified object and mark it as deleted
 function commitDeletedObject(json, onSuccessHandler, onFailureHandler)
@@ -228 +228 @@
         var onFailure = onFailureHandler ? onFailureHandler : defaultFailureHandler;
         var timeFun = setAjaxTimeout(TIMEOUT, COMMIT_URL);
-        
         new Ajax.Request(MARK_AS_DELETED_URL, {
-            "method" : "post",
+            "method" : "delete",
             "postBody" : json,
             "onSuccess" : createXHRHandler(onSuccessHandler, timeFun),

trunk/src/json/json_tmcl_validation.lisp ¶

@@ -203 +203 @@
     (let ((topic-types
            (loop for role in (player-in-roles topic-instance :revision revision)
-              when (eq instance (instance-of role :revision revision))
+              when (and (eq instance (instance-of role :revision revision))
+                        (parent role :revision revision))
               collect (loop for other-role in
                            (roles (parent role :revision revision) :revision revision)
@@ -229 +230 @@
     (let ((topic-instances
            (loop for role in (player-in-roles topic-instance :revision revision)
-              when (eq type (instance-of role :revision revision))
+              when (and (eql type (instance-of role :revision revision))
+                        (parent role :revision revision))
               collect (loop for other-role in (roles (parent role :revision revision)
                                                      :revision revision)
@@ -255 +257 @@
     (let ((supertypes
            (loop for role in (player-in-roles topic-instance :revision revision)
-              when (eq subtype (instance-of role :revision revision))
+              when (and (eq subtype (instance-of role :revision revision))
+                        (parent role :revision revision))
               append (loop for other-role in (roles (parent role :revision revision)
                                                     :revision revision)
@@ -282 +285 @@
     (let ((subtypes
            (loop for role in (player-in-roles topic-instance :revision revision)
-              when (eq supertype (instance-of role :revision revision))
+              when (and (eq supertype (instance-of role :revision revision))
+                        (parent role :revision revision))
               append (loop for other-role in (roles (parent role :revision revision)
                                                     :revision revision)
@@ -319 +323 @@
           (current-valid-subtypes (append valid-subtypes (list topic-instance))))
       (loop for role in (player-in-roles topic-instance :revision revision)
-         when (and (eq supertype (instance-of role :revision revision))
+         when (and (parent role :revision revision)
+                   (eq supertype (instance-of role :revision revision))
                    (eq supertype-subtype
                        (instance-of (parent role :revision revision)
@@ -358 +363 @@
                append (loop for role in (player-in-roles subtype-of-this
                                                          :revision revision)
-                         when (and (eq type (instance-of role :revision revision))
+                         when (and (parent role :revision revision)
+                                   (eq type (instance-of role :revision revision))
                                    (eq type-instance
                                        (instance-of (parent role :revision revision)

trunk/src/model/datamodel.lisp ¶

@@ -2771 +2771 @@
   (let ((owner (parent construct :revision 0)))
     (when owner
+      ;(private-delete-player construct (player construct :revision revision)
+      ;:revision revision)
       (private-delete-role owner construct :revision revision))))
 

trunk/src/rest_interface/set-up-json-interface.lisp ¶

@@ -388 +388 @@
   (declare (ignorable param)) ;param is currently not used
   (let ((http-method (hunchentoot:request-method*)))
-    (if (eq http-method :DELETE)
+    (if (or (eq http-method :DELETE)
+            (eq http-method :Post)) ;not nice - but the current ui-library can't send http-delete messages
         (let ((external-format (flexi-streams:make-external-format :UTF-8 :eol-style :LF)))
           (let ((json-data (hunchentoot:raw-post-data :external-format external-format :force-text t)))