isidorus-cvs September 2011

isidorus-cvs@common-lisp.net

1 participants
184 discussions

[isidorus-cvs] r897 - branches/gdl-frontend/src/json/JTM
by lgiessmann＠common-lisp.net 14 Sep '11

14 Sep '11

Author: lgiessmann Date: Wed Sep 14 03:35:08 2011 New Revision: 897 Log: jtm-importer: fixed a bug when importing occurrence and variant datatype that are represetned as curies Modified: branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp branches/gdl-frontend/src/json/JTM/jtm_importer.lisp Modified: branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp ============================================================================== --- branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp Wed Sep 14 02:25:05 2011 (r896) +++ branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp Wed Sep 14 03:35:08 2011 (r897) @@ -233,7 +233,15 @@ (when curies (jtm::compute-uri-from-jtm-identifier (first curies) prefs)))) (value (jtm::get-item :VALUE jtm-decoded-list)) - (datatype (jtm::get-item :DATATYPE jtm-decoded-list)) + (datatype + (let ((curie (jtm::get-item :DATATYPE jtm-decoded-list))) + (cond ((null curie) + constants:*xml-string*) + ((and (tools:string-starts-with curie "[") + (tools:string-ends-with curie "]")) + (jtm::compute-uri-from-jtm-identifier curie prefs)) + (t + curie)))) (type (let ((curie (jtm::get-item :TYPE jtm-decoded-list))) (when curie @@ -260,6 +268,8 @@ (reifier (reified-construct reifier :revision revision)) (parent + (format t "parent: ~a, charvalue: ~a, datatype: ~a, type: ~a, scope: ~a~%" + parent value datatype type scope) (let ((found-occs (tools:remove-null (map 'list (lambda(occ) @@ -274,8 +284,8 @@ (t (error "when deleting an occurrence, there must be an item-identifier, reifier or parent set!"))))) (when occ-to-delete - (delete-occurrence (parent occ-to-delete :revision revision) - occ-to-delete :revision revision) + ;(delete-occurrence (parent occ-to-delete :revision revision) + ;occ-to-delete :revision revision) occ-to-delete)))) Modified: branches/gdl-frontend/src/json/JTM/jtm_importer.lisp ============================================================================== --- branches/gdl-frontend/src/json/JTM/jtm_importer.lisp Wed Sep 14 02:25:05 2011 (r896) +++ branches/gdl-frontend/src/json/JTM/jtm_importer.lisp Wed Sep 14 03:35:08 2011 (r897) @@ -469,7 +469,15 @@ (let* ((iis (import-identifiers-from-jtm-strings (get-item :ITEM--IDENTIFIERS jtm-list) :prefixes prefixes)) - (datatype (get-item :DATATYPE jtm-list)) + (datatype + (let ((curie (jtm::get-item :DATATYPE jtm-list))) + (cond ((null curie) + constants:*xml-string*) + ((and (tools:string-starts-with curie "[") + (tools:string-ends-with curie "]")) + (jtm::compute-uri-from-jtm-identifier curie prefixes)) + (t + curie)))) (scope (get-item :SCOPE jtm-list)) (type (get-item :TYPE jtm-list)) (value (get-item :VALUE jtm-list)) @@ -487,7 +495,7 @@ (error (make-condition 'JTM-error :message (format nil "From import-occurrence-from-jtm-list(): the JTM occurrence ~a must have a type set in its members." jtm-list)))) (make-construct 'OccurrenceC :start-revision revision :item-identifiers iis - :datatype (if datatype datatype *xml-string*) + :datatype datatype :charvalue value :themes (get-items-from-jtm-references scope :revision revision :prefixes prefixes) @@ -522,7 +530,15 @@ (let* ((iis (import-identifiers-from-jtm-strings (get-item :ITEM--IDENTIFIERS jtm-list) :prefixes prefixes)) - (datatype (get-item :DATATYPE jtm-list)) + (datatype + (let ((curie (jtm::get-item :DATATYPE jtm-list))) + (cond ((null curie) + constants:*xml-string*) + ((and (tools:string-starts-with curie "[") + (tools:string-ends-with curie "]")) + (jtm::compute-uri-from-jtm-identifier curie prefixes)) + (t + curie)))) (value (get-item :VALUE jtm-list)) (reifier (get-item :REIFIER jtm-list)) (parent-references (get-item :PARENT jtm-list))

1 0

[isidorus-cvs] r896 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 14 Sep '11

14 Sep '11

Author: lgiessmann Date: Wed Sep 14 02:25:05 2011 New Revision: 896 Log: gdl-frontend: Widgets: changed the update mechanism when committing http://textgrid.org/serviceregistry/model/types/Hash-Object instances => instead of deleting the entire old topic, only the old occurrence is deleted Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Wed Sep 14 00:29:19 2011 (r895) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Wed Sep 14 02:25:05 2011 (r896) @@ -5,6 +5,8 @@ import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.base.Utils; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; +import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; + import com.google.gwt.core.client.JsArray; import com.google.gwt.http.client.Request; import com.google.gwt.http.client.RequestBuilder; @@ -14,7 +16,9 @@ import com.google.gwt.http.client.URL; import com.google.gwt.json.client.JSONArray; import com.google.gwt.json.client.JSONObject; +import com.google.gwt.json.client.JSONParser; import com.google.gwt.json.client.JSONString; +import com.google.gwt.json.client.JSONValue; import com.google.gwt.user.client.Window; import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.ExporterException; import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine; @@ -33,6 +37,7 @@ public final String DELETE_REUQEST_URL = IsidorusConstants.DELETE_REQUEST_URL; public final String COMMIT_REQUEST_URL = IsidorusConstants.COMMIT_REQUEST_URL; public final String GET_REQUEST_URL = IsidorusConstants.GET_FRAGMENT_REQUEST_URL; + public final String HASH_VALUE_OCCURRENCE_TYPE = "http://textgrid.org/serviceregistry/model/value"; @Override @@ -234,24 +239,24 @@ if (200 == response.getStatusCode()) { if(edited){ String[] topPsi = Utils.splitUriByLastFragment(psi); - String[] tmPsi = Utils.splitUriByLastFragment(IsidorusConstants.TOPIC_MAP_IDENTIFIER); + String[] hashValuePsi = Utils.splitUriByLastFragment(CommitCallback.this.HASH_VALUE_OCCURRENCE_TYPE); JSONObject delObj = new JSONObject(); - delObj.put("type", new JSONString("Topic")); - JSONObject prefs = new JSONObject(); - prefs.put("pref_1", new JSONString(topPsi[0])); - prefs.put("pref_2", new JSONString(tmPsi[0])); - JSONObject delTop = new JSONObject(); - delTop.put("prefixes", prefs); - delTop.put("version", new JSONString("1.1")); - delTop.put("item_type", new JSONString("topic")); - JSONArray jPsis = new JSONArray(); - jPsis.set(0, new JSONString("[pref_1:" + topPsi[1] + "]")); - delTop.put("subject_identifiers", jPsis); + delObj.put("type", new JSONString("Occurrence")); + JSONObject delOcc = new JSONObject(); + delObj.put("delete", delOcc); + delOcc.put("version", new JSONString("1.1")); + delOcc.put("item_type", new JSONString("occurrence")); + JSONObject prefixes = new JSONObject(); + prefixes.put("pref_1", new JSONString(topPsi[0])); + prefixes.put("pref_2", new JSONString(hashValuePsi[0])); + delOcc.put("prefixes", prefixes); JSONArray jParents = new JSONArray(); - jParents.set(0, new JSONString("ii:[pref_2:" + tmPsi[1] + "]")); - delTop.put("parent", jParents); - delObj.put("delete", delTop); + jParents.set(0, new JSONString("si:[pref_1:" + topPsi[1] + "]")); + delOcc.put("parent", jParents); + + delOcc.put("value", this.getOldHashValue(response.getText(), this.psi)); + delOcc.put("type", new JSONString("si:[pref_2:" + hashValuePsi[1] + "]")); Window.alert(">>\n" + delObj.toString()); @@ -284,6 +289,122 @@ // TODO: reset page } } + + + private JSONString getOldHashValue(String jtmFragment, String topicPsiToBeUpdated){ + JSONString result = new JSONString(""); + if(jtmFragment == null || topicPsiToBeUpdated == null) return result; + + JSONValue receivedFragment = JSONParser.parseStrict(jtmFragment); + JSONObject fragment = receivedFragment.isObject(); + if(fragment == null) return result; + + JSONValue topsVal = fragment.get("topics"); + if(topsVal == null) return result; + JSONArray topics = topsVal.isArray(); + if(topics == null) return result; + + JSONValue prefVal = fragment.get("prefixes"); + JSONObject prefixes = null; + if(prefVal != null) prefixes = prefVal.isObject(); + + for(int topicIdx = 0; topicIdx != topics.size(); ++topicIdx){ + JSONValue hashTopicVal = topics.get(topicIdx); + if(hashTopicVal == null) continue; + + JSONObject hashTopic = hashTopicVal.isObject(); + if(hashTopic == null) continue; + + JSONValue psisVal = topics.get(topicIdx); + if(psisVal == null) continue; + + JSONArray psis = psisVal.isArray(); + if(psis == null) continue; + for(int psiIdx = 0; psiIdx != psis.size(); ++psiIdx){ + JSONValue psiVal = psis.get(psiIdx); + if(psiVal == null) continue; + + JSONString psi = psiVal.isString(); + if(psi != null && this.computeUri(psi.stringValue(), prefixes).equals(psi)){ + JSONObject occ = this.gethashValueOccurrence(hashTopic, prefixes); + if(occ == null) continue; + + JSONValue occVal = occ.get("value"); + if(occVal == null) continue; + + JSONString occValue = occVal.isString(); + if(occValue != null) return occValue; + } + } + } + + + return result; + } + + + private JSONObject gethashValueOccurrence(JSONObject hashTopic, JSONObject prefixes){ + if(hashTopic == null) return null; + + JSONValue occsVal = hashTopic.get("occurrences"); + if(occsVal == null) return null; + JSONArray occurrences = occsVal.isArray(); + if(occurrences == null) return null; + for(int occIdx = 0; occIdx != occurrences.size(); ++occIdx){ + JSONValue occVal = occurrences.get(occIdx); + if(occVal == null) continue; + JSONObject occurrence = occVal.isObject(); + if(occurrence == null) continue; + JSONValue typeVal = occurrence.get("type"); + if(typeVal == null) continue; + JSONString typeReference = typeVal.isString(); + if(typeReference == null) continue; + + Pair<String, TopicIdentifierTypes> typeRef = this.computeReferenceUri(typeReference, prefixes); + if(typeRef != null && typeRef.getSecond().equals(TopicIdentifierTypes.SubjectIdentifier) && typeRef.getFirst().equals(CommitCallback.this.HASH_VALUE_OCCURRENCE_TYPE)) return occurrence; + } + + return null; + } + + + private Pair<String, TopicIdentifierTypes> computeReferenceUri(JSONString curieReference, JSONObject prefixes){ + if(curieReference == null) return null; + + String curieString = curieReference.stringValue(); + if(curieString == null) return null; + + if(curieString.startsWith("ii:")){ + return new Pair<String, TopicIdentifierTypes>(this.computeUri(curieString.substring(3), prefixes), TopicIdentifierTypes.ItemIdentifier); + } else if(curieString.startsWith("si:")){ + return new Pair<String, TopicIdentifierTypes>(this.computeUri(curieString.substring(3), prefixes), TopicIdentifierTypes.SubjectIdentifier); + } else if(curieString.startsWith("sl:")){ + return new Pair<String, TopicIdentifierTypes>(this.computeUri(curieString.substring(3), prefixes), TopicIdentifierTypes.SubjectLocator); + } else { + return null; + } + } + + + private String computeUri(String curie, JSONObject prefixes){ + if(curie == null) return ""; + + if(curie.charAt(0) == '[' && curie.charAt(curie.length() - 1) == ']'){ + if(prefixes == null) return ""; + String rawString = curie.substring(1, curie.length() - 1); + String[] parts = rawString.split(":"); + if(parts.length != 2) return ""; + + JSONValue prefVal = prefixes.get(parts[0]); + if(prefVal == null) return ""; + JSONString prefString = prefVal.isString(); + if(prefString == null) return ""; + + return prefString + parts[1]; + } else { + return curie; + } + } @Override @@ -294,6 +415,8 @@ } + + private class HashObjectDeleteRequest implements RequestCallback{ private String objectToBeDeleted = null; private String objectToBeSend = null;

1 0

[isidorus-cvs] r895 - in branches/gdl-frontend/src: json/JTM model
by lgiessmann＠common-lisp.net 14 Sep '11

14 Sep '11

Author: lgiessmann Date: Wed Sep 14 00:29:19 2011 New Revision: 895 Log: jtm-delete-interface: changed the implementation of the delete interface => not the constructs that will be deleted won't instantiated before te actual delete operation is invoked Modified: branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp branches/gdl-frontend/src/model/datamodel.lisp Modified: branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp ============================================================================== --- branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp Tue Sep 13 22:56:28 2011 (r894) +++ branches/gdl-frontend/src/json/JTM/jtm_delete_interface.lisp Wed Sep 14 00:29:19 2011 (r895) @@ -13,7 +13,6 @@ (in-package :jtm-delete-interface) - (defun mark-as-deleted-from-jtm (jtm-data &key (revision *TM-REVISION*)) "Marks an object that is specified by the given JSON data as deleted." (declare (string jtm-data) (integer revision)) @@ -64,15 +63,58 @@ "Deletes the passed role object and returns t otherwise this function returns nil." (declare (list jtm-decoded-list) (integer revision)) - (let* ((role-to-delete - (import-construct-from-jtm-decoded-list - jtm-decoded-list :revision revision)) - (parent-assoc - (when role-to-delete - (parent role-to-delete :revision revision)))) - (when parent-assoc - (d:delete-role parent-assoc role-to-delete :revision revision) - role-to-delete))) + (let* ((prefs (jtm::make-prefix-list-from-jtm-list + (jtm::get-item :PREFIXES jtm-decoded-list))) + (ii + (let ((curies (jtm::get-item :ITEM--IDENTIFIERS jtm-decoded-list))) + (when curies + (jtm::compute-uri-from-jtm-identifier (first curies) prefs)))) + (type + (let ((curie (jtm::get-item :TYPE jtm-decoded-list))) + (when curie + (jtm::get-item-from-jtm-reference curie :revision revision + :prefixes prefs)))) + (reifier + (let ((curie (jtm::get-item :REIFIER jtm-decoded-list))) + (when curie + (jtm::get-item-from-jtm-reference + curie :revision revision :prefixes prefs)))) + (parent + (let* ((curies (jtm::get-item :PARENT jtm-decoded-list)) + (parents (jtm::get-items-from-jtm-references + curies :revision revision :prefixes prefs))) + (when parents + (first parents)))) + (player-top + (let ((curie (jtm::get-item :PLAYER jtm-decoded-list))) + (when curie + (jtm::get-item-from-jtm-reference curie :revision revision + :prefixes prefs))))) + (let ((role-to-delete + (cond (ii + (identified-construct ii :revision revision)) + (reifier + (reified-construct reifier :revision revision)) + (parent + (let ((found-roles + (tools:remove-null + (map 'list (lambda(role) + (when (d::equivalent-construct + role :start-revision revision + :player player-top + :instance-of type) + role)) + (roles parent :revision revision))))) + (when found-roles + (first found-roles)))) + (t + (error "when deleting a role, there must be an item-identifier, reifier or parent set!"))))) + (when role-to-delete + (delete-role (parent role-to-delete :revision revision) + role-to-delete :revision revision) + role-to-delete)))) + + (defun delete-association-from-jtm (jtm-decoded-list &key @@ -80,12 +122,50 @@ "Deletes the passed association object and returns t otherwise this function returns nil." (declare (list jtm-decoded-list) (integer revision)) - (let ((assoc - (import-construct-from-jtm-decoded-list - jtm-decoded-list :revision revision))) - (when assoc - (d:mark-as-deleted assoc :revision revision :source-locator nil) - assoc))) + (let* ((prefs (jtm::make-prefix-list-from-jtm-list + (jtm::get-item :PREFIXES jtm-decoded-list))) + (ii + (let ((curies (jtm::get-item :ITEM--IDENTIFIERS jtm-decoded-list))) + (when curies + (jtm::compute-uri-from-jtm-identifier (first curies) prefs)))) + (scope + (let ((curies (jtm::get-item :SCOPE jtm-decoded-list))) + (jtm::get-items-from-jtm-references + curies :revision revision :prefixes prefs))) + (type + (let ((curie (jtm::get-item :TYPE jtm-decoded-list))) + (when curie + (jtm::get-item-from-jtm-reference curie :revision revision + :prefixes prefs)))) + (reifier + (let ((curie (jtm::get-item :REIFIER jtm-decoded-list))) + (when curie + (jtm::get-item-from-jtm-reference + curie :revision revision :prefixes prefs)))) + (roles + (map 'list (lambda(jtm-role) + (jtm::make-plist-of-jtm-role + jtm-role :revision revision :prefixes prefs)) + (jtm::get-item :ROLES jtm-decoded-list)))) + (let ((assoc-to-delete + (cond (ii + (identified-construct ii :revision revision)) + (reifier + (reified-construct reifier :revision revision)) + (t + (let ((found-assocs + (tools:remove-null + (map 'list (lambda(assoc) + (d::equivalent-construct + assoc :start-revision revision + :roles roles :instance-of type + :themes scope)) + (get-all-associations revision))))) + (when found-assocs + (first found-assocs))))))) + (when assoc-to-delete + (mark-as-deleted assoc-to-delete :revision revision) + assoc-to-delete)))) (defun delete-variant-from-jtm (jtm-decoded-list @@ -93,16 +173,52 @@ "Deletes the passed variant from the given name and returns t if the operation succeeded." (declare (list jtm-decoded-list) (integer revision)) - (let* ((variant-to-delete - (import-construct-from-jtm-decoded-list - jtm-decoded-list :revision revision)) - (parent-name - (when variant-to-delete - (parent variant-to-delete :revision revision)))) - (when parent-name - (d:delete-variant parent-name variant-to-delete :revision revision) - variant-to-delete))) - + (let* ((prefs (jtm::make-prefix-list-from-jtm-list + (jtm::get-item :PREFIXES jtm-decoded-list))) + (ii + (let ((curies (jtm::get-item :ITEM--IDENTIFIERS jtm-decoded-list))) + (when curies + (jtm::compute-uri-from-jtm-identifier (first curies) prefs)))) + (value (jtm::get-item :VALUE jtm-decoded-list)) + (datatype (jtm::get-item :DATATYPE jtm-decoded-list)) + (scope + (let ((curies (jtm::get-item :SCOPE jtm-decoded-list))) + (jtm::get-items-from-jtm-references + curies :revision revision :prefixes prefs))) + (parent + (let* ((curies (jtm::get-item :PARENT jtm-decoded-list)) + (parents (jtm::get-items-from-jtm-references + curies :revision revision :prefixes prefs))) + (when parents + (first parents)))) + (reifier + (let ((curie (jtm::get-item :REIFIER jtm-decoded-list))) + (when curie + (jtm::get-item-from-jtm-reference + curie :revision revision :prefixes prefs))))) + (let ((var-to-delete + (cond (ii + (identified-construct ii :revision revision)) + (reifier + (reified-construct reifier :revision revision)) + (parent + (let ((found-vars + (tools:remove-null + (map 'list (lambda(var) + (when (d::equivalent-construct + var :start-revision revision + :charvalue value :themes scope + :datatype datatype) + var)) + (variants parent :revision revision))))) + (when found-vars + (first found-vars)))) + (t + (error "when deleting a variant, there must be an item-identifier, reifier or parent set!"))))) + (when var-to-delete + (delete-variant (parent var-to-delete :revision revision) + var-to-delete :revision revision) + var-to-delete)))) (defun delete-occurrence-from-jtm (jtm-decoded-list @@ -110,29 +226,114 @@ "Deletes the passed occurrence from the given topic and returns t if the operation succeeded." (declare (list jtm-decoded-list) (integer revision)) - (let* ((occurrence-to-delete - (import-construct-from-jtm-decoded-list - jtm-decoded-list :revision revision)) - (parent-topic - (when occurrence-to-delete - (parent occurrence-to-delete :revision revision)))) - (when parent-topic - (d:delete-occurrence parent-topic occurrence-to-delete :revision revision) - occurrence-to-delete))) + (let* ((prefs (jtm::make-prefix-list-from-jtm-list + (jtm::get-item :PREFIXES jtm-decoded-list))) + (ii + (let ((curies (jtm::get-item :ITEM--IDENTIFIERS jtm-decoded-list))) + (when curies + (jtm::compute-uri-from-jtm-identifier (first curies) prefs)))) + (value (jtm::get-item :VALUE jtm-decoded-list)) + (datatype (jtm::get-item :DATATYPE jtm-decoded-list)) + (type + (let ((curie (jtm::get-item :TYPE jtm-decoded-list))) + (when curie + (jtm::get-item-from-jtm-reference curie :revision revision + :prefixes prefs)))) + (scope + (let ((curies (jtm::get-item :SCOPE jtm-decoded-list))) + (jtm::get-items-from-jtm-references + curies :revision revision :prefixes prefs))) + (parent + (let* ((curies (jtm::get-item :PARENT jtm-decoded-list)) + (parents (jtm::get-items-from-jtm-references + curies :revision revision :prefixes prefs))) + (when parents + (first parents)))) + (reifier + (let ((curie (jtm::get-item :REIFIER jtm-decoded-list))) + (when curie + (jtm::get-item-from-jtm-reference + curie :revision revision :prefixes prefs))))) + (let ((occ-to-delete + (cond (ii + (identified-construct ii :revision revision)) + (reifier + (reified-construct reifier :revision revision)) + (parent + (let ((found-occs + (tools:remove-null + (map 'list (lambda(occ) + (when (d::equivalent-construct + occ :start-revision revision + :charvalue value :themes scope + :instance-of type :datatype datatype) + occ)) + (occurrences parent :revision revision))))) + (when found-occs + (first found-occs)))) + (t + (error "when deleting an occurrence, there must be an item-identifier, reifier or parent set!"))))) + (when occ-to-delete + (delete-occurrence (parent occ-to-delete :revision revision) + occ-to-delete :revision revision) + occ-to-delete)))) (defun delete-name-from-jtm (jtm-decoded-list &key (revision *TM-REVISION*)) (declare (list jtm-decoded-list) (integer revision)) - (let* ((name-to-delete - (import-construct-from-jtm-decoded-list - jtm-decoded-list :revision revision)) - (parent-topic - (when name-to-delete - (parent name-to-delete :revision revision)))) - (when parent-topic - (d:delete-name parent-topic name-to-delete :revision revision) - name-to-delete))) + (let* ((prefs (jtm::make-prefix-list-from-jtm-list + (jtm::get-item :PREFIXES jtm-decoded-list))) + (ii + (let ((curies (jtm::get-item :ITEM--IDENTIFIERS jtm-decoded-list))) + (when curies + (jtm::compute-uri-from-jtm-identifier (first curies) prefs)))) + (value (jtm::get-item :VALUE jtm-decoded-list)) + (type + (let ((curie (jtm::get-item :TYPE jtm-decoded-list))) + (if curie + (jtm::get-item-from-jtm-reference curie :revision revision + :prefixes prefs) + (get-item-by-psi constants:*topic-name-psi* + :revision revision :error-if-nil t)))) + (scope + (let ((curies (jtm::get-item :SCOPE jtm-decoded-list))) + (jtm::get-items-from-jtm-references + curies :revision revision :prefixes prefs))) + (parent + (let* ((curies (jtm::get-item :PARENT jtm-decoded-list)) + (parents (jtm::get-items-from-jtm-references + curies :revision revision :prefixes prefs))) + (when parents + (first parents)))) + (reifier + (let ((curie (jtm::get-item :REIFIER jtm-decoded-list))) + (when curie + (jtm::get-item-from-jtm-reference + curie :revision revision :prefixes prefs))))) + (let ((name-to-delete + (cond (ii + (identified-construct ii :revision revision)) + (reifier + (reified-construct reifier :revision revision)) + (parent + (let ((found-names + (tools:remove-null + (map 'list (lambda(name) + (when (d::equivalent-construct + name :start-revision revision + :charvalue value :themes scope + :instance-of type) + name)) + (names parent :revision revision))))) + (when found-names + (first found-names)))) + (t + (error "when deleting a name, there must be an item-identifier, reifier or parent set!"))))) + (when name-to-delete + (delete-name (parent name-to-delete :revision revision) + name-to-delete :revision revision) + name-to-delete)))) (defun delete-identifier-from-json (uri class delete-function @@ -155,12 +356,21 @@ "Searches for a topic corresponding to the given identifiers. Returns t if there was deleted an item otherweise it returns nil." (declare (list jtm-decoded-list) (integer revision)) - (let ((top-to-delete - (import-construct-from-jtm-decoded-list - jtm-decoded-list :revision revision))) - (when top-to-delete - (mark-as-deleted top-to-delete :source-locator nil :revision revision) - top-to-delete))) + + (let* ((prefs + (jtm::make-prefix-list-from-jtm-list + (jtm::get-item :PREFIXES jtm-decoded-list))) + (ids (append + (jtm::get-item :SUBJECT--IDENTIFIERS jtm-decoded-list) + (jtm::get-item :ITEM--IDENTIFIERS jtm-decoded-list) + (jtm::get-item :SUBJECT--LOCATORS jtm-decoded-list))) + (uri (if (null ids) + (error (make-condition 'exceptions::JTM-error :message (format nil "From merge-topic-from-jtm-list(): the passed topic has to own at least one identifier: ~a" jtm-decoded-list))) + (jtm::compute-uri-from-jtm-identifier (first ids) prefs)))) + (let ((top-to-delete (get-item-by-any-id uri :revision revision))) + (when top-to-delete + (mark-as-deleted top-to-delete :source-locator uri :revision revision) + top-to-delete)))) (defun delete-identifier-from-jtm (uri class delete-function @@ -170,10 +380,7 @@ (declare (string uri) (integer revision) (symbol class)) (let ((id (elephant:get-instance-by-value class 'd:uri uri))) - (if (and id (typep id class)) - (progn - (apply delete-function - (list (d:identified-construct id :revision revision) - id :revision revision)) - id) - nil))) \ No newline at end of file + (when (and id (typep id class)) + (apply delete-function + (list (d:identified-construct id :revision revision) + id :revision revision))))) \ No newline at end of file Modified: branches/gdl-frontend/src/model/datamodel.lisp ============================================================================== --- branches/gdl-frontend/src/model/datamodel.lisp Tue Sep 13 22:56:28 2011 (r894) +++ branches/gdl-frontend/src/model/datamodel.lisp Wed Sep 14 00:29:19 2011 (r895) @@ -1583,10 +1583,10 @@ (locators top :revision 0)) (mapc (lambda (name) (mark-as-deleted name :revision revision :source-locator source-locator)) - (names top :revision 0)) + (names top :revision 0)) (mapc (lambda (occ) (mark-as-deleted occ :revision revision :source-locator source-locator)) - (occurrences top :revision 0)) + (occurrences top :revision 0)) (mapc (lambda (ass) (mark-as-deleted ass :revision revision :source-locator source-locator)) (find-all-associations top :revision 0))

1 0

[isidorus-cvs] r894 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 14 Sep '11

14 Sep '11

Author: lgiessmann Date: Tue Sep 13 22:56:28 2011 New Revision: 894 Log: gdl-frontend: Widgets: fixed a bug when creating delete requests to update http://textgrid.org/serivceregistry/model/types/Hash-Object Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 06:31:06 2011 (r893) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 22:56:28 2011 (r894) @@ -246,7 +246,7 @@ delTop.put("version", new JSONString("1.1")); delTop.put("item_type", new JSONString("topic")); JSONArray jPsis = new JSONArray(); - jPsis.set(0, new JSONString("pref_1:" + topPsi[1])); + jPsis.set(0, new JSONString("[pref_1:" + topPsi[1] + "]")); delTop.put("subject_identifiers", jPsis); JSONArray jParents = new JSONArray(); jParents.set(0, new JSONString("ii:[pref_2:" + tmPsi[1] + "]"));

1 0

[isidorus-cvs] r893 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 13 Sep '11

13 Sep '11

Author: lgiessmann Date: Tue Sep 13 06:31:06 2011 New Revision: 893 Log: gdl-frontend: Widgets: set the http-header to application/json in the requests defined in CommitCallback Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 05:37:30 2011 (r892) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 06:31:06 2011 (r893) @@ -106,6 +106,7 @@ String url = URL.encode(this.COMMIT_REQUEST_URL); RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, url); + builder.setHeader("Content-type", "application/json"); try{ // a check for an existing environment topic is not necessary, // since it would be exactly the same topic.

1 0

[isidorus-cvs] r892 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base isidorus
by lgiessmann＠common-lisp.net 13 Sep '11

13 Sep '11

Author: lgiessmann Date: Tue Sep 13 05:37:30 2011 New Revision: 892 Log: gdl-frontend: Widgets: fixed a bug in Utils.splitUri(...) Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Tue Sep 13 05:05:27 2011 (r891) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Tue Sep 13 05:37:30 2011 (r892) @@ -2,7 +2,6 @@ import java.util.ArrayList; - import us.isidor.gdl.anaToMia.TmEngine.jtmsBasedEngine.JtmsTmEngine; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; @@ -25,7 +24,7 @@ @Override public void onModuleLoad() { - try{ + try{ RootPanel.get("GWT_Content").add(mainPanel); mainPanel.setBorderWidth(1); mainPanel.setPixelSize(1000, 600); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Tue Sep 13 05:05:27 2011 (r891) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Tue Sep 13 05:37:30 2011 (r892) @@ -24,7 +24,7 @@ if(lastPos <= 0) return new String[]{uri, null}; String prefix = uri.substring(0, lastPos + 1); - String suffix = uri.substring(lastPos); + String suffix = uri.substring(lastPos + 1); suffix = suffix == null ? "" : suffix; return new String[]{prefix, suffix}; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 05:05:27 2011 (r891) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 05:37:30 2011 (r892) @@ -243,6 +243,7 @@ JSONObject delTop = new JSONObject(); delTop.put("prefixes", prefs); delTop.put("version", new JSONString("1.1")); + delTop.put("item_type", new JSONString("topic")); JSONArray jPsis = new JSONArray(); jPsis.set(0, new JSONString("pref_1:" + topPsi[1])); delTop.put("subject_identifiers", jPsis);

1 0

[isidorus-cvs] r891 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 13 Sep '11

13 Sep '11

Author: lgiessmann Date: Tue Sep 13 05:05:27 2011 New Revision: 891 Log: gdl-frontend: Widgets: fixed a bug when creating delete requests to update http://textgrid.org/serivceregistry/model/types/Hash-Object Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 03:59:14 2011 (r890) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 05:05:27 2011 (r891) @@ -242,6 +242,7 @@ prefs.put("pref_2", new JSONString(tmPsi[0])); JSONObject delTop = new JSONObject(); delTop.put("prefixes", prefs); + delTop.put("version", new JSONString("1.1")); JSONArray jPsis = new JSONArray(); jPsis.set(0, new JSONString("pref_1:" + topPsi[1])); delTop.put("subject_identifiers", jPsis);

1 0

[isidorus-cvs] r890 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 13 Sep '11

13 Sep '11

Author: lgiessmann Date: Tue Sep 13 03:59:14 2011 New Revision: 890 Log: Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 03:53:22 2011 (r889) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 03:59:14 2011 (r890) @@ -246,7 +246,7 @@ jPsis.set(0, new JSONString("pref_1:" + topPsi[1])); delTop.put("subject_identifiers", jPsis); JSONArray jParents = new JSONArray(); - jParents.set(0, new JSONString("pref_2:" + tmPsi[1])); + jParents.set(0, new JSONString("ii:[pref_2:" + tmPsi[1] + "]")); delTop.put("parent", jParents); delObj.put("delete", delTop);

1 0

[isidorus-cvs] r889 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base isidorus
by lgiessmann＠common-lisp.net 13 Sep '11

13 Sep '11

Author: lgiessmann Date: Tue Sep 13 03:53:22 2011 New Revision: 889 Log: gdl-frontend: Widgets: fixed a bug when creating delete requests to update http://textgrid.org/serivceregistry/model/types/Hash-Object Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Tue Sep 13 03:48:13 2011 (r888) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.java Tue Sep 13 03:53:22 2011 (r889) @@ -12,6 +12,25 @@ public class Utils { + // returns an array with two string objects. + // * the first element is the uri prefix until the last "/" or "#" character + // * the second element is the sufix + public static String[] splitUriByLastFragment(String uri) { + if(uri == null) return new String[]{null, null}; + + int idxSlash = uri.lastIndexOf("/"); + int idxSharp = uri.lastIndexOf("#"); + int lastPos = idxSlash < idxSharp ? idxSharp : idxSlash; + if(lastPos <= 0) return new String[]{uri, null}; + + String prefix = uri.substring(0, lastPos + 1); + String suffix = uri.substring(lastPos); + suffix = suffix == null ? "" : suffix; + + return new String[]{prefix, suffix}; + } + + // returns a string of the form: // { // association-type: psi Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 03:48:13 2011 (r888) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 03:53:22 2011 (r889) @@ -248,6 +248,7 @@ JSONArray jParents = new JSONArray(); jParents.set(0, new JSONString("pref_2:" + tmPsi[1])); delTop.put("parent", jParents); + delObj.put("delete", delTop); Window.alert(">>\n" + delObj.toString());

1 0

[isidorus-cvs] r888 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 13 Sep '11

13 Sep '11

Author: lgiessmann Date: Tue Sep 13 03:48:13 2011 New Revision: 888 Log: gdl-frontend: Widgets: fixed a bug when creating delete requests to update http://textgrid.org/serivceregistry/model/types/Hash-Object Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 03:21:42 2011 (r887) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 03:48:13 2011 (r888) @@ -3,6 +3,7 @@ import java.util.ArrayList; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; +import us.isidor.gdl.anaToMia.Widgets.base.Utils; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import com.google.gwt.core.client.JsArray; import com.google.gwt.http.client.Request; @@ -11,6 +12,9 @@ import com.google.gwt.http.client.RequestException; import com.google.gwt.http.client.Response; import com.google.gwt.http.client.URL; +import com.google.gwt.json.client.JSONArray; +import com.google.gwt.json.client.JSONObject; +import com.google.gwt.json.client.JSONString; import com.google.gwt.user.client.Window; import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.ExporterException; import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine; @@ -172,7 +176,6 @@ String getUrl = URL.encode(this.GET_REQUEST_URL + psiValue); RequestBuilder getBuilder = new RequestBuilder(RequestBuilder.GET, getUrl); try{ - Window.alert("edited: " + edited); getBuilder.sendRequest(null, new HashObjectCheckRequest(jtm, psiValue, edited)); }catch(RequestException e){ Window.alert("could not commit the topic: " + jtm + ", because(" + e.getClass() + "): " + e.getMessage()); @@ -229,13 +232,31 @@ public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { if(edited){ - String delObj = response.getText(); + String[] topPsi = Utils.splitUriByLastFragment(psi); + String[] tmPsi = Utils.splitUriByLastFragment(IsidorusConstants.TOPIC_MAP_IDENTIFIER); + + JSONObject delObj = new JSONObject(); + delObj.put("type", new JSONString("Topic")); + JSONObject prefs = new JSONObject(); + prefs.put("pref_1", new JSONString(topPsi[0])); + prefs.put("pref_2", new JSONString(tmPsi[0])); + JSONObject delTop = new JSONObject(); + delTop.put("prefixes", prefs); + JSONArray jPsis = new JSONArray(); + jPsis.set(0, new JSONString("pref_1:" + topPsi[1])); + delTop.put("subject_identifiers", jPsis); + JSONArray jParents = new JSONArray(); + jParents.set(0, new JSONString("pref_2:" + tmPsi[1])); + delTop.put("parent", jParents); + + Window.alert(">>\n" + delObj.toString()); + try{ String url = URL.encode(CommitCallback.this.DELETE_REUQEST_URL); RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url); builder.setHeader("Content-type", "application/json"); - builder.sendRequest(delObj, new HashObjectDeleteRequest(delObj, this.objectToBeSend)); + builder.sendRequest(delObj.toString(), new HashObjectDeleteRequest(delObj.toString(), this.objectToBeSend)); }catch(RequestException e){ Window.alert("could not update the topic " + delObj); //TODO: reset page

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

isidorus-cvs September 2011