Changeset 279

Timestamp:

04/15/10 17:52:44 (15 years ago)

Author:

lgiessmann

Message:

docs: fixed some bad ebnf definitions of the json interface; json: currently only active topics are exported, mark-as-deleted topics are not exported; ajax: added the possibility that the ui is able to mark topics, names and occurrences as deleted ---> at the moment there is a problem when recreating occurrences and names that have already existed

Location:

trunk

Files:

• docs/json.ebnf (modified) (1 diff)
• docs/xtm_json.txt (modified) (1 diff)
• src/ajax/css/frame.css (modified) (2 diffs)
• src/ajax/javascripts/constants.js (modified) (2 diffs)
• src/ajax/javascripts/datamodel.js (modified) (13 diffs)
• src/ajax/javascripts/requests.js (modified) (1 diff)
• src/json/json_exporter.lisp (modified) (3 diffs)
• src/json/json_importer.lisp (modified) (1 diff)
• src/json/json_tmcl.lisp (modified) (7 diffs)
• src/json/json_tmcl_validation.lisp (modified) (2 diffs)
• src/rest_interface/set-up-json-interface.lisp (modified) (3 diffs)

trunk/docs/json.ebnf ¶

@@ -195 +195 @@
 DeleteTopics = "\"topics\":" List
 DeleteAssociations = "\"associations\":" Associations
-DeleteParentTopic = "\"parent-topic\":" String
-DeleteParentName = "\"parent-name\":" Name
+DeleteParentTopic = "\"parentTopic\":" String
+DeleteParentName = "\"parentName\":" Name
 DeleteNames = "\"names\":" Names
 DeleteVariants = "\"variants\":" Variants
 DeleteOccurrences = "\"occurrences\":" Occurrences
-DeleteParentAssociation = "\"parent-association\":" Association
+DeleteParentAssociation = "\"parentAssociation\":" Association
 DeleteRoles = "\"roles\":" Roles
 

trunk/docs/xtm_json.txt ¶

@@ -468 +468 @@
   "topics": [<psi-top-1>, <psi-top-2>, <...>],
   "associations": [<association-1>, <association-2>, <...>],
-  "parent-topic": "topic-psi",
-  "parent-name": <name>,
+  "parentTopic": "topic-psi",
+  "parentName": <name>,
   "names": [<name-1>, <name-2>, <...>],
   "variants": [<variant-1>, <variant-2>, <...>],
   "occurrences": [<occurrence-1>, <occurrence-2>, <...>],
-  "parent-association": <association>,
+  "parentAssociation": <association>,
   "roles": [<role-1>, <role-2>, <...>]
 }

trunk/src/ajax/css/frame.css ¶

@@ -28 +28 @@
 }
 
+tr.removeNameRow {
+    background-color: #eaeaee;
+}
+
+tr.removeOccurrenceRow {
+    background-color: #eaeaee;
+}
+
+tr.removeTopicRow {
+    background-color: #eaeaee;
+}
+
 li.errorMessage {
     margin-top: 1em;
@@ -140 +152 @@
 }
 
+span.removeLink {
+    cursor: pointer;
+    font-size: 0.75em;
+    float: right;
+    margin-right: 1em;
+}
+
+span.removeLink:hover {
+    color:#ff7f00;
+}
+
 
 /* === topic frame ========================================================== */

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

@@ -23 +23 @@
 var OWN_URL = HOST_PREF + "isidorus";
 var SUMMARY_URL = HOST_PREF + "json/summary"
+    var MARK_AS_DELETED_URL = HOST_PREF + "mark-as-deleted";
 var TM_OVERVIEW = "/json/tmcl/overview/";
 var TIMEOUT = 10000; // const TIMEOUT = 10000 --> "const" doesn't work under IE
@@ -90 +91 @@
                "instances" : function(){ return "instances"; },
                "subtypes" : function(){ return "subtypes"; },
-               "topicPsis" : function(){ return "topicPsis"; }
+               "topicPsis" : function(){ return "topicPsis"; },
+               "removeLink" : function(){ return "removeLink"; },
+               "removeNameRow" : function(){ return "removeOccurrenceRow"; },
+               "removeOccurrenceRow" : function(){ return "removeNameRow"; },
+               "removeTopicRow" : function(){ return "removeTopicRow"; }
               };

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

@@ -1448 +1448 @@
                                                       });
                                               }
+
+                                              var myself = this;
+                                              this.__table__.insert({"bottom" : makeRemoveLink(function(event){
+                                                              makeDeleteObject("Name", myself);
+                                                          }, "delete Name")});
                                           }
                                           catch(err){
@@ -1492 +1497 @@
                                               this.getFrame().select("tr." + CLASSES.valueFrame())[0].hide();
                                               this.getFrame().select("tr." + CLASSES.variantContainer())[0].hide();
+                                              this.getFrame().select("tr." + CLASSES.removeNameRow())[0].hide();
                                               this.__isMinimized__ = true;
                                           }
@@ -1501 +1507 @@
                                               this.getFrame().select("tr." + CLASSES.valueFrame())[0].show();
                                               this.getFrame().select("tr." + CLASSES.variantContainer())[0].show();
+                                              this.getFrame().select("tr." + CLASSES.removeNameRow())[0].show();
                                               this.__isMinimized__ = false;
                                           }
@@ -1513 +1520 @@
                                           this.getFrame().writeAttribute({"class" : CLASSES.disabled()});
                                           this.getFrame().writeAttribute({"title" : this.__cssTitle__});
+                                          this.getFrame().select("tr." + CLASSES.removeNameRow())[0].disable();
                                           this.hideAddButton();
                                           this.__disabled__ = true;
@@ -1524 +1532 @@
                                           this.getFrame().writeAttribute({"class" : CLASSES.nameFrame()});
                                           this.getFrame().removeAttribute("title");
+                                          this.getFrame().select("tr." + CLASSES.removeNameRow())[0].enable();
                                           checkRemoveAddButtons(this.__owner__, 1, this.__max__, this);
                                           this.__disabled__ = false;
@@ -1743 +1752 @@
 
 
+function makeRemoveLink (removeHandler, textContent){
+    var link = new Element("span", {"class" : CLASSES.removeLink()}).update(textContent);
+    var trClass = null;
+    switch(textContent){
+      case "delete Occurrence" : trClass = CLASSES.removeOccurrenceRow(); break;
+      case "delete Topic" : trClass = CLASSES.removeTopicRow(); break;
+      case "delete Name" : trClass = CLASSES.removeNameRow(); break;
+    }
+
+    var tr = new Element("tr", {"class" : trClass}).insert(new Element("td", {"colspan" : 3}).insert(link));
+    if(removeHandler){ link.observe("click", removeHandler); }
+    return tr;
+}
+
+
+function makeDeleteObject(type, objectToDelete){
+    if(type !== "Occurrence" && type !== "Name" && type !== "Variant"
+       && type !== "Topic" && type !== "Association"){
+        throw "From makeDeleteObject(): type must be: \"Occurrence\" || \"Name\" " +
+            "|| \"Variant\" || \"Topic\" || \"Association\" but is " + type;
+    }
+    if (!objectToDelete){
+        throw "From makeDeleteObject(): objectToDelete must be set";
+    }
+
+    var parentTopic = "null";
+    if(type === "Occurrence" || type === "Name"){
+        var psiFrame = objectToDelete.getFrame().parentNode.parentNode.parentNode.parentNode.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){
+                parentTopic = 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();
+                break;
+            }
+        }
+    }
+
+    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" + "}";
+ 
+    commitDeletedObject(jsonData, function(xhr){
+            alert("Objected deleted");
+            if(type === "Topic"){
+                $(CLASSES.subPage()).update();
+                makeHome();
+            }
+            else if (type === "Occurrence" || type === "Name"){
+                if(objectToDelete.__owner__.__frames__.length > objectToDelete.__max__
+                   && objectToDelete.__owner__.__frames__.length > 1){
+                    objectToDelete.remove();
+                }
+                else {
+                    if(type === "Occurrence"){ objectToDelete.__value__.setValue(""); }
+                    else { objectToDelete.__value__.__frames__[0].__content__.setValue(""); }
+                }
+            }
+        });
+    
+}
+
 // --- represenation of an occurrence element
 var OccurrenceC = Class.create(ContainerC, {"initialize" : function($super, contents, occurrenceTypes, constraint, uniqueConstraints, owner, min, max, cssTitle, dblClickHandler){
@@ -1827 +1922 @@
                                                             });
                                                     }
+                                                    var myself = this;
+                                                    this.__table__.insert({"bottom" : makeRemoveLink(function(event){
+                                                                    makeDeleteObject("Occurrence", myself);
+                                                                }, "delete Occurrence")});
                                                 }
                                                 catch(err){
@@ -1895 +1994 @@
                                                     this.getFrame().select("tr." + CLASSES.valueFrame())[0].hide();
                                                     this.getFrame().select("tr." + CLASSES.datatypeFrame())[0].hide();
+                                                    this.getFrame().select("tr." + CLASSES.removeOccurrenceRow())[0].hide();
                                                     this.__isMinimized__ = true;
                                                 }
@@ -1904 +2004 @@
                                                     this.getFrame().select("tr." + CLASSES.valueFrame())[0].show();
                                                     this.getFrame().select("tr." + CLASSES.datatypeFrame())[0].show();
+                                                    if(this.__disabled__ === false){
+                                                        this.getFrame().select("tr." + CLASSES.removeOccurrenceRow())[0].show();
+                                                    }
                                                     this.__isMinimized__ = false;
                                                 }
@@ -1917 +2020 @@
                                                 this.getFrame().writeAttribute({"title" : this.__cssTitle__});
                                                 this.hideAddButton();
+                                                this.getFrame().select("tr." + CLASSES.removeOccurrenceRow())[0].hide();
                                                 this.__disabled__ = true;
                                             },
@@ -1929 +2033 @@
                                                 this.getFrame().removeAttribute("title");
                                                 checkRemoveAddButtons(this.__owner__, 1, this.__max__, this);
+                                                this.getFrame().select("tr." + CLASSES.removeOccurrenceRow())[0].show();
                                                 this.__disabled__ = false;
                                             }});
@@ -2223 +2328 @@
                                                this.__occurrence__ = new OccurrenceContainerC(occurrencesContent, _constraints);
                                                this.__table__.insert({"bottom" : newRow(CLASSES.occurrenceContainer(), "Occurrences", this.__occurrence__.getFrame())});
+
+                                               var myself = this;
+                                               this.__table__.insert({"bottom" : makeRemoveLink(function(event){
+                                                               makeDeleteObject("Topic", myself);
+                                                           }, "delete Topic")});
                                            }catch(err){
                                                alert("From TopciC(): " + err);
@@ -2262 +2372 @@
                                                      this.getFrame().select("tr." + CLASSES.subjectIdentifierFrame())[0],
                                                      this.getFrame().select("tr." + CLASSES.nameContainer())[0],
-                                                     this.getFrame().select("tr." + CLASSES.occurrenceContainer())[0]);
+                                                     this.getFrame().select("tr." + CLASSES.occurrenceContainer())[0],
+                                                     this.getFrame().select("tr." + CLASSES.removeTopicRow())[0]);
                                            for(var i = 0; i != rows.length; ++i){
                                                if(this.__minimized__ === false) rows[i].hide();

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

@@ -220 +220 @@
 
 
+// --- Sends a POST-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)
+{
+    if(!json || !onSuccessHandler) throw "From commitDeletedObject(): json and onSuccessHandler must be set!";
+    try{
+        var onFailure = onFailureHandler ? onFailureHandler : defaultFailureHandler;
+        var timeFun = setAjaxTimeout(TIMEOUT, COMMIT_URL);
+        
+        new Ajax.Request(MARK_AS_DELETED_URL, {
+            "method" : "post",
+            "postBody" : json,
+            "onSuccess" : createXHRHandler(onSuccessHandler, timeFun),
+            "onFailure" : createXHRHandler(onFailure, timeFun)});
+    }
+    catch(err){
+        alert("From commitDeletedObject(): " + err);
+    }
+}
+
+
 // --- Requests a JSON-Fragment for the passed psi and calls the onSuccessHandler function
 // --- after a succeeded request.

trunk/src/json/json_exporter.lisp ¶

@@ -9 +9 @@
 
 (defpackage :json-exporter
-  (:use :cl :json :datamodel)
+  (:use :cl :json :datamodel :json-tmcl-constants)
   (:export :to-json-string
            :get-all-topic-psis
@@ -299 +299 @@
                                     (when psi-list
                                       (map 'list #'uri psi-list)))
-                          (map 'list #'psis (elephant:get-instances-by-class 'TopicC))))))
+                          (json-tmcl::clean-topics
+                           (elephant:get-instances-by-class 'TopicC))))))
 
 
@@ -352 +353 @@
         (concatenate 'string "[" json-string "]"))
       "null"))
+
+
+(defun clean-topics(isas-or-akos)
+  (remove-if
+   #'null
+   (map 'list
+        #'(lambda(top)
+            (when (d:find-item-by-revision top 0)
+              top))
+        isas-or-akos)))

trunk/src/json/json_importer.lisp ¶

@@ -363 +363 @@
               (t
                (error "json-importer:get-fragment-values-from-json-string:
-                       bad item-specifier found in json-list"))))
+                       bad item-specifier found in json-list (~a)" (car j-elem)))))
       (unless topic
         (error "json-importer:get-fragment-values-from-json-string: the element topic must be set"))

trunk/src/json/json_tmcl.lisp ¶

@@ -180 +180 @@
   (declare (list names) (string parent-psi) (integer revision))
   (let ((parent-topic (d:get-item-by-psi parent-psi))
-        (err "From delete-name-from-json(): "))
+        (err "From delete-names-from-json(): "))
     (unless parent-topic
       (error "~a~a not found"
@@ -236 +236 @@
   (declare (list occurrences) (string parent-psi) (integer revision))
   (let ((parent-topic (d:get-item-by-psi parent-psi))
-        (err "From delete-occurrence-from-json(): "))
+        (err "From delete-occurrences-from-json(): "))
     (unless parent-topic
       (error "~a~a not found" err parent-psi))
@@ -285 +285 @@
   (dolist (j-assoc associations)
     (let ((plist (json-importer::get-association-values-from-json-list j-assoc))
-          (err "From delete-association-from-json(): "))
+          (err "From delete-associations-from-json(): "))
       (let ((assoc (find-association-from-json plist)))
         (unless assoc
@@ -298 +298 @@
       (let ((psi (elephant:get-instance-by-value 'd:PersistentIdC 'd:uri uri)))
         (unless psi
-          (error "From delete-topic-from-json(): PSI ~a not found" uri))
+          (error "From delete-topics-from-json(): PSI ~a not found" uri))
         (pushnew psi psis)))
     (let ((tops
@@ -1574 +1574 @@
                                        (get-direct-subtypes-of-topic topic-instance)))))))
       (let ((cleaned-isas ;;all constraint topics are removed
-             (remove-if #'null (map 'list #'(lambda(top-entry)
-                                              (when (find-if #'(lambda(psi)
-                                                                   (unless (or (string= (uri psi) *constraint-psi*)
-                                                                               (string= (uri psi) *occurrencetype-psi*)
-                                                                               (string= (uri psi) *nametype-psi*)
-                                                                               (string= (uri psi) *associationtype-psi*)
-                                                                               (string= (uri psi) *roletype-psi*)
-                                                                               (string= (uri psi) *scopetype-psi*)
-                                                                               (string= (uri psi) *schema-psi*))
-                                                                     top-entry))
-                                                               (psis (getf top-entry :topic)))
-                                                top-entry))
-                                    isas-of-this)))
+             (clean-topic-entries isas-of-this))
             (cleaned-akos ;;all constraint topics are removed
-             (remove-if #'null (map 'list #'(lambda(top-entry)
-                                              (when (find-if #'(lambda(psi)
-                                                                   (unless (or (string= (uri psi) *constraint-psi*)
-                                                                               (string= (uri psi) *occurrencetype-psi*)
-                                                                               (string= (uri psi) *nametype-psi*)
-                                                                               (string= (uri psi) *associationtype-psi*)
-                                                                               (string= (uri psi) *roletype-psi*)
-                                                                               (string= (uri psi) *scopetype-psi*)
-                                                                               (string= (uri psi) *schema-psi*))
-                                                                     top-entry))
-                                                               (psis (getf top-entry :topic)))
-                                                top-entry))
-                                    akos-of-this))))
+             (clean-topic-entries akos-of-this)))
         (list :topic topic-instance
               :is-type is-type
@@ -1611 +1587 @@
                              cleaned-akos))))))
 
+(defun clean-topic-entries(isas-or-akos)
+  (remove-if
+   #'null
+   (map 'list
+        #'(lambda(top-entry)
+            (when (and (d:find-item-by-revision (getf top-entry :topic) 0)
+                       (find-if
+                        #'(lambda(psi)
+                            (unless (or (string= (uri psi) *constraint-psi*)
+                                        (string= (uri psi) *occurrencetype-psi*)
+                                        (string= (uri psi) *nametype-psi*)
+                                        (string= (uri psi) *associationtype-psi*)
+                                        (string= (uri psi) *roletype-psi*)
+                                        (string= (uri psi) *scopetype-psi*)
+                                        (string= (uri psi) *schema-psi*))
+                              top-entry))
+                        (psis (getf top-entry :topic))))
+              top-entry))
+        isas-or-akos)))
+
 
 (defun get-all-tree-roots ()
@@ -1616 +1612 @@
    of any other topic."
   (let ((all-topics
-         (elephant:get-instances-by-class 'd:TopicC)))
+         (remove-if #'null
+                    (map 'list
+                         #'(lambda(top)
+                             (when (d:find-item-by-revision top 0)
+                               top))
+                         (elephant:get-instances-by-class 'd:TopicC)))))
     (remove-if #'null
                (map 'list #'(lambda(x)

trunk/src/json/json_tmcl_validation.lisp ¶

@@ -376 +376 @@
   "Returns all topics that are valid tmcl-types"
   (let ((all-topics
-         (elephant:get-instances-by-class 'd:TopicC))
+         (json-exporter::clean-topics
+          (elephant:get-instances-by-class 'd:TopicC)))
         (topictype (get-item-by-psi json-tmcl-constants::*topictype-psi*))
         (topictype-constraint (is-type-constrained)))
@@ -400 +401 @@
    type-instance or supertype-subtype."
   (let ((all-topics
-         (elephant:get-instances-by-class 'd:TopicC)))
+         (json-exporter::clean-topics
+          (elephant:get-instances-by-class 'd:TopicC))))
     (let ((valid-instances
            (remove-if #'null

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

@@ -116 +116 @@
    hunchentoot:*dispatch-table*)
   (push
-   (create-regex-dispatcher mark-as-deleted-url #'mark-as-deleted)
+   (create-regex-dispatcher mark-as-deleted-url #'mark-as-deleted-handler)
    hunchentoot:*dispatch-table*))
 
@@ -303 +303 @@
     (handler-case (with-reader-lock
                     (let ((topics 
-                           (elephant:get-instances-by-class 'd:TopicC)))
+                           (remove-if
+                            #'null
+                            (map 'list #'(lambda(top)
+                                           (when (d:find-item-by-revision top 0)
+                                             top))
+                                 (elephant:get-instances-by-class 'd:TopicC)))))
                       (let ((end
                              (cond
@@ -373 +378 @@
         (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+))))
 
+
 ;; =============================================================================
 ;; --- some helper functions ---------------------------------------------------