isidorus-cvs

isidorus-cvs@common-lisp.net

1037 discussions

[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

[isidorus-cvs] r887 - 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:21:42 2011 New Revision: 887 Log: gdl-frontend: Widgets: fixed a bug with the commit button's id of http://textgrid.org/serviceregistry/model/types/Hash-Object in the CommitCallback class of Isidorus 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:20:04 2011 (r886) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 03:21:42 2011 (r887) @@ -34,9 +34,10 @@ @Override public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine) { try{ - if("hash_object_commit_button_id".equals(buttonId)){ - Window.alert("buttonId: " + buttonId); - this.commitCreatedHashObject(constructs, tmEngine, "edited_hash_object_commit_button_id".equals(buttonId)); + if("creator_hash_object_commit_button_id".equals(buttonId)){ + this.commitCreatedHashObject(constructs, tmEngine, false); + }else if("editor_hash_object_commit_button_id".equals(buttonId)){ + this.commitCreatedHashObject(constructs, tmEngine, true); } else if("environment_commit_button_id".equals(buttonId)){ this.commitCreatedEnvironment(constructs, tmEngine); }

1 0

[isidorus-cvs] r886 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets
by lgiessmann＠common-lisp.net 13 Sep '11

13 Sep '11

Author: lgiessmann Date: Tue Sep 13 03:20:04 2011 New Revision: 886 Log: gdl-frontend: Widgets: fixed a bug with the commit button's id of http://textgrid.org/serviceregistry/model/types/Hash-Object Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Tue Sep 13 03:14:38 2011 (r885) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Tue Sep 13 03:20:04 2011 (r886) @@ -147,7 +147,7 @@ {"subject_identifiers":["[tgg:hash-object-creator-reset-button-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]}, {"subject_identifiers":["[tgg:hash-object-creator-reset-button-value]"], "instance_of":["si:[gdlt:Default-Literal-Value]"], "occurrences":[{"type":"si:[gdl:literal-value]", "value":"reset"}]}, - {"subject_identifiers":["[tgg:hash-object-creator-commit-button]"], "instance_of":["si:[gdlt:Commit-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_commit_button_id"}, {"type":"si:[gdl:height]", "value":"30px"}, {"type":"si:[gdl:width]", "value":"80px"}, {"type":"si:[gdl:font-size]", "value":"12px"}]}, + {"subject_identifiers":["[tgg:hash-object-creator-commit-button]"], "instance_of":["si:[gdlt:Commit-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"creator_hash_object_commit_button_id"}, {"type":"si:[gdl:height]", "value":"30px"}, {"type":"si:[gdl:width]", "value":"80px"}, {"type":"si:[gdl:font-size]", "value":"12px"}]}, {"subject_identifiers":["[tgg:hash-object-creator-commit-button-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"115px"}, {"type":"si:[gdl:right]", "value":"10px"}]} ], Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm Tue Sep 13 03:14:38 2011 (r885) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Edit_HashObject.jtm Tue Sep 13 03:20:04 2011 (r886) @@ -135,7 +135,7 @@ {"subject_identifiers":["[tgg:hash-object-editor-delete-button]"], "instance_of":["si:[gdlt:Delete-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_delete_button_id"}, {"type":"si:[gdl:height]", "value":"30px"}, {"type":"si:[gdl:width]", "value":"80px"}, {"type":"si:[gdl:font-size]", "value":"12px"}]}, {"subject_identifiers":["[tgg:hash-object-editor-delete-button-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"115px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, - {"subject_identifiers":["[tgg:hash-object-editor-commit-button]"], "instance_of":["si:[gdlt:Commit-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_commit_button_id"}, {"type":"si:[gdl:height]", "value":"30px"}, {"type":"si:[gdl:width]", "value":"80px"}, {"type":"si:[gdl:font-size]", "value":"12px"}]}, + {"subject_identifiers":["[tgg:hash-object-editor-commit-button]"], "instance_of":["si:[gdlt:Commit-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"editor_hash_object_commit_button_id"}, {"type":"si:[gdl:height]", "value":"30px"}, {"type":"si:[gdl:width]", "value":"80px"}, {"type":"si:[gdl:font-size]", "value":"12px"}]}, {"subject_identifiers":["[tgg:hash-object-editor-commit-button-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"115px"}, {"type":"si:[gdl:right]", "value":"10px"}]} ], Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm Tue Sep 13 03:14:38 2011 (r885) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm Tue Sep 13 03:20:04 2011 (r886) @@ -2537,7 +2537,7 @@ "item_identifiers":null, "datatype":"http://www.w3.org/2001/XMLSchema#string", "type":"si:[pref_3:id]", - "value":"hash_object_commit_button_id", + "value":"editor_hash_object_commit_button_id", "scope":null, "reifier":null }, @@ -3470,7 +3470,7 @@ "item_identifiers":null, "datatype":"http://www.w3.org/2001/XMLSchema#string", "type":"si:[pref_3:id]", - "value":"hash_object_commit_button_id", + "value":"creator_hash_object_commit_button_id", "scope":null, "reifier":null }, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm Tue Sep 13 03:14:38 2011 (r885) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm Tue Sep 13 03:20:04 2011 (r886) @@ -1696,7 +1696,7 @@ <t:type> <t:topicRef href="#t2746" /> </t:type> - <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_commit_button_id</t:resourceData> + <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">creator_hash_object_commit_button_id</t:resourceData> </t:occurrence> <t:occurrence> <t:type> @@ -2373,7 +2373,7 @@ <t:type> <t:topicRef href="#t2746" /> </t:type> - <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_commit_button_id</t:resourceData> + <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">editor_hash_object_commit_button_id</t:resourceData> </t:occurrence> <t:occurrence> <t:type> Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm Tue Sep 13 03:14:38 2011 (r885) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm Tue Sep 13 03:20:04 2011 (r886) @@ -753,7 +753,7 @@ "item_identifiers":null, "datatype":"http://www.w3.org/2001/XMLSchema#string", "type":"si:[pref_3:id]", - "value":"hash_object_commit_button_id", + "value":"editor_hash_object_commit_button_id", "scope":null, "reifier":null }, @@ -1686,7 +1686,7 @@ "item_identifiers":null, "datatype":"http://www.w3.org/2001/XMLSchema#string", "type":"si:[pref_3:id]", - "value":"hash_object_commit_button_id", + "value":"creator_hash_object_commit_button_id", "scope":null, "reifier":null }, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm Tue Sep 13 03:14:38 2011 (r885) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm Tue Sep 13 03:20:04 2011 (r886) @@ -1696,7 +1696,7 @@ <t:type> <t:topicRef href="#t2746" /> </t:type> - <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_commit_button_id</t:resourceData> + <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">creator_hash_object_commit_button_id</t:resourceData> </t:occurrence> <t:occurrence> <t:type> @@ -2373,7 +2373,7 @@ <t:type> <t:topicRef href="#t2746" /> </t:type> - <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">hash_object_commit_button_id</t:resourceData> + <t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">editor_hash_object_commit_button_id</t:resourceData> </t:occurrence> <t:occurrence> <t:type> Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm Tue Sep 13 03:14:38 2011 (r885) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm Tue Sep 13 03:20:04 2011 (r886) @@ -758,7 +758,7 @@ "item_identifiers":null, "datatype":"http://www.w3.org/2001/XMLSchema#string", "type":"si:[pref_3:id]", - "value":"hash_object_commit_button_id", + "value":"editor_hash_object_commit_button_id", "scope":null, "reifier":null }, @@ -1691,7 +1691,7 @@ "item_identifiers":null, "datatype":"http://www.w3.org/2001/XMLSchema#string", "type":"si:[pref_3:id]", - "value":"hash_object_commit_button_id", + "value":"creator_hash_object_commit_button_id", "scope":null, "reifier":null },

1 0

[isidorus-cvs] r885 - 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:14:38 2011 New Revision: 885 Log: gdl-frontend: Widgets: made some changes to easily debug the update handlers 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/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 02:54:27 2011 (r884) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Tue Sep 13 03:14:38 2011 (r885) @@ -31,13 +31,14 @@ mainPanel.setPixelSize(1000, 600); ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); - //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier)); - requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Environment", TopicIdentifierTypes.SubjectIdentifier)); + requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier)); + //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Environment", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Poet", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Musician", TopicIdentifierTypes.SubjectIdentifier)); //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-env-1", TopicIdentifierTypes.SubjectIdentifier); //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier); + Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/hash-object/Test Environment 1/test1", TopicIdentifierTypes.SubjectIdentifier); GdlPanel.addClickHandler("hash_object_reset_button_id", new ClickHandler() { @Override public void onClick(ClickEvent event) { @@ -46,7 +47,7 @@ } }); - gdlPanel = new GdlPanel(null, requestedTopicsToCreate); + gdlPanel = new GdlPanel(requestedTopicToEdit, null); mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); 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 02:54:27 2011 (r884) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 03:14:38 2011 (r885) @@ -35,6 +35,7 @@ public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine) { try{ if("hash_object_commit_button_id".equals(buttonId)){ + Window.alert("buttonId: " + buttonId); this.commitCreatedHashObject(constructs, tmEngine, "edited_hash_object_commit_button_id".equals(buttonId)); } else if("environment_commit_button_id".equals(buttonId)){ this.commitCreatedEnvironment(constructs, tmEngine); @@ -170,6 +171,7 @@ 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());

1 0

[isidorus-cvs] r884 - 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 02:54:27 2011 New Revision: 884 Log: gdl-frontend: Widgets: refactred the update handler for http://textgrid.org/serviceregistry/model/types/Hash-Object 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/DeleteCallback.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 02:28:13 2011 (r883) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 02:54:27 2011 (r884) @@ -226,7 +226,17 @@ public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { if(edited){ - //TODO: implement + String delObj = response.getText(); + 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)); + }catch(RequestException e){ + Window.alert("could not update the topic " + delObj); + //TODO: reset page + } } else { Window.alert("could not commit the topic with the psi " + psi + " since it already exists"); //TODO: reset page @@ -255,6 +265,47 @@ } } + + private class HashObjectDeleteRequest implements RequestCallback{ + private String objectToBeDeleted = null; + private String objectToBeSend = null; + + + @SuppressWarnings("unused") + private HashObjectDeleteRequest(){} + + + public HashObjectDeleteRequest(String objectToBeDeleted, String objectToBeSend){ + this.objectToBeDeleted = objectToBeDeleted; + this.objectToBeSend = objectToBeSend; + } + + + @Override + public void onResponseReceived(Request request, Response response) { + if (200 == response.getStatusCode()) { + try{ + String commitUrl = URL.encode(CommitCallback.this.COMMIT_REQUEST_URL); + RequestBuilder commitBuilder = new RequestBuilder(RequestBuilder.POST, commitUrl); + commitBuilder.setHeader("Content-type", "application/json"); + commitBuilder.sendRequest(this.objectToBeSend, new HashObjectCommitRequest(this.objectToBeSend)); + }catch(RequestException e){ + Window.alert("could not commit the data: " + this.objectToBeSend); + // TODO: reset web page + } + } else { + Window.alert("update operation of the object " + this.objectToBeDeleted + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); + } + } + + + @Override + public void onError(Request request, Throwable exception) { + Window.alert("could not update the data: " + this.objectToBeDeleted); + // TODO: reset web page + } + } + private class HashObjectCommitRequest implements RequestCallback { private String objectToBeSend = null; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Tue Sep 13 02:28:13 2011 (r883) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java Tue Sep 13 02:54:27 2011 (r884) @@ -53,7 +53,6 @@ RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, url); builder.setHeader("Content-type", "application/json"); - //RootPanel.getBodyElement().setInnerText(delObj.toString()); // TODO: remove builder.sendRequest(delObj.toString(), new DeleteRequest(delObj, env)); }catch(RequestException e){ Window.alert("could not delete the topic: " + psi + ", because(" + e.getClass() + "): " + e.getMessage());

1 0

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

13 Sep '11

Author: lgiessmann Date: Tue Sep 13 02:28:13 2011 New Revision: 883 Log: jtm-importer + gdl-interface: added a boolean variable to the jtm-importer, so a fragment of each topic that is contained in the received jtm-fragment can be created automiticaly Modified: branches/gdl-frontend/src/json/JTM/jtm_importer.lisp branches/gdl-frontend/src/model/changes.lisp branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Modified: branches/gdl-frontend/src/json/JTM/jtm_importer.lisp ============================================================================== --- branches/gdl-frontend/src/json/JTM/jtm_importer.lisp Tue Sep 13 02:07:39 2011 (r882) +++ branches/gdl-frontend/src/json/JTM/jtm_importer.lisp Tue Sep 13 02:28:13 2011 (r883) @@ -29,7 +29,8 @@ (defun import-construct-from-jtm-string (jtm-string &key (revision *TM-REVISION*) - (jtm-format :1.1) tm-id) + (jtm-format :1.1) tm-id + (create-fragments nil)) "Imports the passed jtm-string. Note tm-id needs not to be declared, but if the imported construct is a topicmap and it has no item-identifiers defined, a JTM-error @@ -37,15 +38,18 @@ (declare (String jtm-string) (type (or Null String) tm-id) (Integer revision) - (Keyword jtm-format)) + (Keyword jtm-format) + (Boolean create-fragments)) (let* ((jtm-list (json:decode-json-from-string jtm-string))) (import-construct-from-jtm-decoded-list - jtm-list :revision revision :jtm-format jtm-format :tm-id tm-id))) + jtm-list :revision revision :jtm-format jtm-format + :tm-id tm-id :create-fragments create-fragments))) (defun import-construct-from-jtm-decoded-list (jtm-list &key - (revision *TM-REVISION*) - (jtm-format :1.1) tm-id) + (revision *TM-REVISION*) + (jtm-format :1.1) tm-id + (create-fragments nil)) "Imports the passed jtm-decoded-list. Note tm-id needs not to be declared, but if the imported construct is a topicmap and it has no item-identifiers defined, a JTM-error @@ -53,7 +57,8 @@ (declare (List jtm-list) (Integer revision) (Keyword jtm-format) - (type (or Null String) tm-id)) + (type (or Null String) tm-id) + (Boolean create-fragments)) (let* ((version (get-item :VERSION jtm-list)) (item_type (get-item :ITEM--TYPE jtm-list)) (prefixes (make-prefix-list-from-jtm-list (get-item :PREFIXES jtm-list))) @@ -72,12 +77,13 @@ (string= item_type item_type-topicmap)) (import-topic-map-from-jtm-list jtm-list tm-id :revision revision :prefixes prefixes - :instance-of-p format-1.1-p)) + :instance-of-p format-1.1-p :create-fragments create-fragments)) ((string= item_type item_type-topic) (import-topic-stub-from-jtm-list jtm-list nil :revision revision :prefixes prefixes) (merge-topic-from-jtm-list jtm-list :instance-of-p format-1.1-p - :revision revision :prefixes prefixes)) + :revision revision :prefixes prefixes + :create-fragment create-fragments)) ((string= item_type item_type-name) (import-name-from-jtm-list jtm-list nil :revision revision :prefixes prefixes)) @@ -111,13 +117,14 @@ (defun import-topic-map-from-jtm-list (jtm-list tm-id &key (revision *TM-REVISION*) - prefixes (instance-of-p t)) + prefixes (instance-of-p t) + (create-fragments nil)) "Creates and returns a topic map corresponding to the tm-id or a given item-identifier in the jtm-list and returns the tm construct after all topics and associations contained in the jtm-list has been created." (declare (List jtm-list prefixes) (Integer revision) - (Boolean instance-of-p)) + (Boolean instance-of-p create-fragments)) (let* ((iis (let ((value (append (import-identifiers-from-jtm-strings (get-item :ITEM--IDENTIFIERS jtm-list) :prefixes prefixes) @@ -134,8 +141,9 @@ :item-identifiers iis))) (import-topic-stubs-from-jtm-lists j-tops (list tm) :revision revision :prefixes prefixes) - (merge-topics-from-jtm-lists j-tops (list tm) :instance-of-p instance-of-p - :revision revision :prefixes prefixes) + (merge-topics-from-jtm-lists j-tops :instance-of-p instance-of-p + :revision revision :prefixes prefixes + :create-fragments create-fragments) (import-associations-from-jtm-lists j-assocs (list tm) :revision revision :prefixes prefixes) tm)) @@ -339,21 +347,24 @@ assoc))) -(defun merge-topics-from-jtm-lists (jtm-lists parents &key (instance-of-p t) - (revision *TM-REVISION*) prefixes) +(defun merge-topics-from-jtm-lists (jtm-lists &key (instance-of-p t) + (revision *TM-REVISION*) prefixes + (create-fragments nil)) "Creates and returns a list of topics." - (declare (List jtm-lists parents prefixes) - (Boolean instance-of-p) + (declare (List jtm-lists prefixes) + (Boolean instance-of-p create-fragments) (Integer revision)) (map 'list #'(lambda(jtm-list) (merge-topic-from-jtm-list jtm-list :revision revision :prefixes prefixes - :instance-of-p instance-of-p)) + :instance-of-p instance-of-p + :create-fragment create-fragments)) jtm-lists)) (defun merge-topic-from-jtm-list(jtm-list &key (instance-of-p t) - (revision *TM-REVISION*) prefixes) + (revision *TM-REVISION*) prefixes + (create-fragment nil)) "Creates and returns a topic object from the passed jtm list generated by json:decode-json-from-string. Note that the merged topics are not added explicitly to the parent @@ -362,7 +373,8 @@ to their topic map elements." (declare (List jtm-list prefixes) (Boolean instance-of-p) - (Integer revision)) + (Integer revision) + (Boolean create-fragment)) (let* ((ids (append (get-item :ITEM--IDENTIFIERS jtm-list) (get-item :SUBJECT--IDENTIFIERS jtm-list) (get-item :SUBJECT--LOCATORS jtm-list))) @@ -396,6 +408,8 @@ (dolist (occ top-occs) (add-occurrence top occ :revision revision)) (format t "t") + (when create-fragment + (create-latest-fragment-of-topic top)) top)) Modified: branches/gdl-frontend/src/model/changes.lisp ============================================================================== --- branches/gdl-frontend/src/model/changes.lisp Tue Sep 13 02:07:39 2011 (r882) +++ branches/gdl-frontend/src/model/changes.lisp Tue Sep 13 02:28:13 2011 (r883) @@ -412,10 +412,12 @@ (find-associations top :revision revision))) -(defun create-latest-fragment-of-topic (topic-psi) +(defun create-latest-fragment-of-topic (topic-or-psi) "Returns the latest fragment of the passed topic-psi" - (declare (string topic-psi)) - (let ((topic (get-latest-topic-by-psi topic-psi))) + (declare (type (or String TopicC) topic-or-psi)) + (let ((topic (if (stringp topic-or-psi) + (get-latest-topic-by-psi topic-or-psi) + topic-or-psi))) (when topic (let ((start-revision (start-revision Modified: branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Tue Sep 13 02:07:39 2011 (r882) +++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Tue Sep 13 02:28:13 2011 (r883) @@ -143,7 +143,8 @@ :force-text t))) (with-writer-lock (jtm-importer:import-construct-from-jtm-string - json-data :revision (get-revision) :tm-id *gdl-tm-id*)))) + json-data :revision (get-revision) :tm-id *gdl-tm-id* + :create-fragments t)))) (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+))))

1 0

[isidorus-cvs] r882 - 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 02:07:39 2011 New Revision: 882 Log: gdl-frontend: Widgets: added a check for existing instances of http://textgrid.org/serviceregistry/model/types/Hash-Object instances, so a commit will succeed only of there is no duplicate topic existent 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 01:35:44 2011 (r881) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 02:07:39 2011 (r882) @@ -11,11 +11,6 @@ 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.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; @@ -160,7 +155,8 @@ Name env = assoc.getRoles(TmHelper.getTopicByPsi("http://textgrid.org/serviceregistry/model/environment", tm)).get(0).getPlayer().getNames().get(0); Occurrence key = top.getOccurrences(TmHelper.getTopicByPsi("http://textgrid.org/serviceregistry/model/key", tm)).get(0); - Locator psi = tm.createLocator("http://textgrid.org/serviceregistry/hash-object/" + env.getValue() + "/" + key.getValue()); + String psiValue = "http://textgrid.org/serviceregistry/hash-object/" + env.getValue() + "/" + key.getValue(); + Locator psi = tm.createLocator(psiValue); this.removeSubjectIdentifiers(top); top.addSubjectIdentifier(psi); @@ -171,14 +167,10 @@ jtm = tmEngine.exportTm(topics, associations); } - String commitUrl = URL.encode(this.COMMIT_REQUEST_URL); - String getUrl = URL.encode(this.GET_REQUEST_URL); - RequestBuilder commitBuilder = new RequestBuilder(RequestBuilder.POST, commitUrl); - commitBuilder.setHeader("Content-type", "application/json"); + String getUrl = URL.encode(this.GET_REQUEST_URL + psiValue); RequestBuilder getBuilder = new RequestBuilder(RequestBuilder.GET, getUrl); - try{ - if(edited)getBuilder.sendRequest(null, new EditedHashObjectCommitRequest(null, jtm, false)); - else commitBuilder.sendRequest(jtm, new HashObjectCommitRequest(jtm)); + try{ + getBuilder.sendRequest(null, new HashObjectCheckRequest(jtm, psiValue, edited)); }catch(RequestException e){ Window.alert("could not commit the topic: " + jtm + ", because(" + e.getClass() + "): " + e.getMessage()); } @@ -217,27 +209,41 @@ } - private class HashObjectCommitRequest implements RequestCallback { + private class HashObjectCheckRequest implements RequestCallback { private String objectToBeSend = null; + private String psi = null; + private boolean edited = false; - @SuppressWarnings("unused") - private HashObjectCommitRequest(){} - - - public HashObjectCommitRequest(String objectToBeCommitted){ - this.objectToBeSend = objectToBeCommitted; - Window.alert("test"); //TODO: remove + public HashObjectCheckRequest(String objectToBeSend, String psi, boolean edited){ + this.objectToBeSend = objectToBeSend; + this.psi = psi; + this.edited = edited; } - + @Override public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { - Window.alert("commit operation of the object " + this.objectToBeSend + " succeeded"); - // TODO: reset the web page + if(edited){ + //TODO: implement + } else { + Window.alert("could not commit the topic with the psi " + psi + " since it already exists"); + //TODO: reset page + } + } else if(404 == response.getStatusCode() && !edited) { + try{ + String commitUrl = URL.encode(CommitCallback.this.COMMIT_REQUEST_URL); + RequestBuilder commitBuilder = new RequestBuilder(RequestBuilder.POST, commitUrl); + commitBuilder.setHeader("Content-type", "application/json"); + commitBuilder.sendRequest(this.objectToBeSend, new HashObjectCommitRequest(this.objectToBeSend)); + }catch(RequestException e){ + Window.alert("could not commit the topic: " + this.objectToBeSend + ", because(" + e.getClass() + "): " + e.getMessage()); + // TODO: reset page + } } else { - Window.alert("commit operation of the object " + this.objectToBeSend + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); + Window.alert("could not commit the topic with the psi " + psi + ", because: " + response.getStatusCode() + ": " + response.getStatusText()); + // TODO: reset page } } @@ -245,97 +251,39 @@ @Override public void onError(Request request, Throwable exception) { Window.alert("could not commit the data: " + this.objectToBeSend); + // TODO: reset page } } - private class EditedHashObjectCommitRequest implements RequestCallback{ - private JSONValue requestedData = null; + private class HashObjectCommitRequest implements RequestCallback { private String objectToBeSend = null; - private boolean deletedOldOccurrence = false; - private final String deleteUrl = URL.encode(CommitCallback.this.DELETE_REUQEST_URL); - private final String commitUrl = URL.encode(CommitCallback.this.COMMIT_REQUEST_URL); @SuppressWarnings("unused") - private EditedHashObjectCommitRequest(){} + private HashObjectCommitRequest(){} - public EditedHashObjectCommitRequest(JSONValue requestedData, String objectToBeSend, boolean deletedOldOccurrence){ - this.requestedData = requestedData; - this.objectToBeSend = objectToBeSend; - this.deletedOldOccurrence = deletedOldOccurrence; + public HashObjectCommitRequest(String objectToBeCommitted){ + this.objectToBeSend = objectToBeCommitted; } @Override public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) { - if(this.requestedData == null){ - JSONObject occurrenceToBeDeleted = this.getOccurrenceTobeDeleted(response.getText()); - if(occurrenceToBeDeleted != null){ - RequestBuilder deleteBuilder = new RequestBuilder(RequestBuilder.DELETE, this.deleteUrl); - deleteBuilder.setHeader("Content-type", "application/json"); - try{ - deleteBuilder.sendRequest(occurrenceToBeDeleted.toString(), new EditedHashObjectCommitRequest(occurrenceToBeDeleted, this.objectToBeSend, true)); - }catch(RequestException e){ - Window.alert("could not commit the topic: " + this.objectToBeSend + ", because(" + e.getClass() + "): " + e.getMessage()); - } - } else { - Window.alert("commit operation of the object " + this.objectToBeSend + " failed, because: the occurrence http://textgrid.org/serviceregistry/model/hash-type could not be updated"); - } - } else if(deletedOldOccurrence){ - RequestBuilder commitBuilder = new RequestBuilder(RequestBuilder.POST, this.commitUrl); - commitBuilder.setHeader("Content-type", "application/json"); - try{ - commitBuilder.sendRequest(this.objectToBeSend, new HashObjectCommitRequest(this.objectToBeSend)); - }catch(RequestException e){ - Window.alert("could not commit the topic: " + this.objectToBeSend + ", because(" + e.getClass() + "): " + e.getMessage()); - } - } else { - Window.alert("commit operation of the object " + this.objectToBeSend + " succeeded"); - // TODO: reset the web page - } + Window.alert("commit operation of the object " + this.objectToBeSend + " succeeded"); + // TODO: reset the web page } else { Window.alert("commit operation of the object " + this.objectToBeSend + " failed: " + response.getStatusCode() + "(" + response.getStatusText() + ")\n" + response.getText()); } } - + @Override public void onError(Request request, Throwable exception) { Window.alert("could not commit the data: " + this.objectToBeSend); - } - - - private JSONObject getOccurrenceTobeDeleted(String json){ - if(json == null) return null; - - JSONValue jsonValue = JSONParser.parseStrict(json); - JSONObject fragment = jsonValue.isObject(); - JSONObject topic = null; - if(fragment != null){ - JSONValue val = fragment.get("topic"); - if(val != null) topic = val.isObject(); - } - if(topic != null){ - JSONValue occs = topic.get("occurrences"); - JSONArray occsArray = null; - if(occs != null) occsArray = occs.isArray(); - if(occsArray != null) { - for(int i = 0; i != occsArray.size(); ++i){ - JSONValue val = occsArray.get(i); - JSONObject occ = val.isObject(); - if(occ == null) continue; - - JSONValue type = occ.get("type"); - JSONString typeStr = type.isString(); - if(typeStr.stringValue().endsWith("hash-type")) return occ; // fr our purpose this soft check is sufficient enough, so the prefix need not to be varified - } - } - } - - return null; + // TODO: reset page } } }

1 0

[isidorus-cvs] r881 - 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 01:35:44 2011 New Revision: 881 Log: gdl-frontend: Widgets: fixed a bug in the commit-url of http://textgrid.org/serviceregistry/model/types/Hash-Object instances 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 00:11:38 2011 (r880) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Tue Sep 13 01:35:44 2011 (r881) @@ -171,14 +171,12 @@ jtm = tmEngine.exportTm(topics, associations); } - String commitUrl = URL.encode(this.DELETE_REUQEST_URL); + String commitUrl = URL.encode(this.COMMIT_REQUEST_URL); String getUrl = URL.encode(this.GET_REQUEST_URL); RequestBuilder commitBuilder = new RequestBuilder(RequestBuilder.POST, commitUrl); commitBuilder.setHeader("Content-type", "application/json"); - RequestBuilder getBuilder = new RequestBuilder(RequestBuilder.POST, getUrl); - try{ - Window.alert(jtm); //TODO: remove - + RequestBuilder getBuilder = new RequestBuilder(RequestBuilder.GET, getUrl); + try{ if(edited)getBuilder.sendRequest(null, new EditedHashObjectCommitRequest(null, jtm, false)); else commitBuilder.sendRequest(jtm, new HashObjectCommitRequest(jtm)); }catch(RequestException e){ @@ -229,6 +227,7 @@ public HashObjectCommitRequest(String objectToBeCommitted){ this.objectToBeSend = objectToBeCommitted; + Window.alert("test"); //TODO: remove }

1 0

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

13 Sep '11

Author: lgiessmann Date: Tue Sep 13 00:11:38 2011 New Revision: 880 Log: jtm-importer: fixed a bug with the "parent" member Modified: branches/gdl-frontend/src/json/JTM/jtm_importer.lisp Modified: branches/gdl-frontend/src/json/JTM/jtm_importer.lisp ============================================================================== --- branches/gdl-frontend/src/json/JTM/jtm_importer.lisp Tue Sep 13 00:10:27 2011 (r879) +++ branches/gdl-frontend/src/json/JTM/jtm_importer.lisp Tue Sep 13 00:11:38 2011 (r880) @@ -76,7 +76,7 @@ ((string= item_type item_type-topic) (import-topic-stub-from-jtm-list jtm-list nil :revision revision :prefixes prefixes) - (merge-topic-from-jtm-list jtm-list nil :instance-of-p format-1.1-p + (merge-topic-from-jtm-list jtm-list :instance-of-p format-1.1-p :revision revision :prefixes prefixes)) ((string= item_type item_type-name) (import-name-from-jtm-list jtm-list nil :revision revision @@ -347,12 +347,12 @@ (Integer revision)) (map 'list #'(lambda(jtm-list) (merge-topic-from-jtm-list - jtm-list parents :revision revision :prefixes prefixes + jtm-list :revision revision :prefixes prefixes :instance-of-p instance-of-p)) jtm-lists)) -(defun merge-topic-from-jtm-list(jtm-list parents &key (instance-of-p t) +(defun merge-topic-from-jtm-list(jtm-list &key (instance-of-p t) (revision *TM-REVISION*) prefixes) "Creates and returns a topic object from the passed jtm list generated by json:decode-json-from-string. @@ -360,7 +360,7 @@ topic maps, it is only needed for the instance-of-associations - topics are added in the function import-topic-stubs-from-jtm-lists to their topic map elements." - (declare (List jtm-list prefixes parents) + (declare (List jtm-list prefixes) (Boolean instance-of-p) (Integer revision)) (let* ((ids (append (get-item :ITEM--IDENTIFIERS jtm-list) @@ -388,7 +388,9 @@ (when (and (not instance-of-p) instanceof) (error (make-condition 'JTM-error :message (format nil "From merge-topic-from-jtm-list(): the JTM-topic has an instance_of member set, but JTM version 1.0 does not allow an intance_of member within a topic object: ~a" jtm-list)))) (dolist (type-top instanceof) - (make-instance-of-association top type-top parents :revision revision)) + (make-instance-of-association + top type-top (in-topicmaps top :revision revision) + :revision revision)) (dolist (name top-names) (add-name top name :revision revision)) (dolist (occ top-occs)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

isidorus-cvs