September 2011 - isidorus-cvs@common-lisp.net

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

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 01:17:37 2011 New Revision: 867 Log: gdl-frontend: Widgets: changed the requested topic type of GdlPanel to Environment for testing purposes Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.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 Mon Sep 12 01:09:20 2011 (r866) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Sep 12 01:17:37 2011 (r867) @@ -31,8 +31,8 @@ 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));

1 0

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

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 01:09:20 2011 New Revision: 866 Log: gdl-frontend: Widgets: fixed a bug in the commit request of created frgments: http-get => http-post 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 Mon Sep 12 00:53:29 2011 (r865) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java Mon Sep 12 01:09:20 2011 (r866) @@ -90,7 +90,7 @@ } String url = URL.encode(this.COMMIT_REQUEST_URL); - RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, url); + RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, url); try{ // a check for an existing environment topic is not necessary, // since it would be exactly the same topic. @@ -162,7 +162,7 @@ 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.GET, getUrl); + RequestBuilder getBuilder = new RequestBuilder(RequestBuilder.POST, getUrl); try{ Window.alert(jtm); //TODO: remove

1 0

[isidorus-cvs] r865 - branches/gdl-frontend/src/rest_interface
by lgiessmann＠common-lisp.net 12 Sep '11

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 00:53:29 2011 New Revision: 865 Log: gdl-backend: added a default tm-id for committing new fragments Modified: branches/gdl-frontend/src/rest_interface/rest-interface.lisp branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Modified: branches/gdl-frontend/src/rest_interface/rest-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/rest-interface.lisp Mon Sep 12 00:24:24 2011 (r864) +++ branches/gdl-frontend/src/rest_interface/rest-interface.lisp Mon Sep 12 00:53:29 2011 (r865) @@ -51,7 +51,15 @@ :*ajax-javascript-directory-path* :*ajax-javascript-url-prefix* :*xtm-commit-prefix* - :*sparql-url*)) + :*sparql-url* + :*gdl-get-fragment* + :*gdl-get-schema* + :*gdl-commit-fragment* + :*gdl-delete-fragment* + :*gdl-host-address* + :*gdl-base-path* + :*gdl-host-file* + :*gdl-tm-id*)) (in-package :rest-interface) Modified: branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Mon Sep 12 00:24:24 2011 (r864) +++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Mon Sep 12 00:53:29 2011 (r865) @@ -9,22 +9,23 @@ (in-package :rest-interface) -(defparameter *get-fragment* "/gdl/fragment/(.+)$") -(defparameter *get-schema* "/gdl/schema/?$") -(defparameter *commit-fragment* "/gdl/commit/?") -(defparameter *delete-fragment* "/gdl/delete/?") -(defparameter *host-address* "/anatomia") -(defparameter *base-path* "anaToMia/hosted_files/") -(defparameter *host-file* (concat *base-path* "GDL_Widgets.html")) - - -(defun set-up-gdl-interface (&key (get-fragment *get-fragment*) - (get-schema *get-schema*) - (commit-fragment *commit-fragment*) - (delete-fragment *delete-fragment*) - (base-path *base-path*) - (host-address *host-address*) - (host-file *host-file*)) +(defparameter *gdl-get-fragment* "/gdl/fragment/(.+)$") +(defparameter *gdl-get-schema* "/gdl/schema/?$") +(defparameter *gdl-commit-fragment* "/gdl/commit/?") +(defparameter *gdl-delete-fragment* "/gdl/delete/?") +(defparameter *gdl-host-address* "/anatomia") +(defparameter *gdl-base-path* "anaToMia/hosted_files/") +(defparameter *gdl-host-file* (concat *gdl-base-path* "GDL_Widgets.html")) +(defparameter *gdl-tm-id* "http://textgrid.org/serviceregistry/gdl-frontend/gdl-tm") + + +(defun set-up-gdl-interface (&key (get-fragment *gdl-get-fragment*) + (get-schema *gdl-get-schema*) + (commit-fragment *gdl-commit-fragment*) + (delete-fragment *gdl-delete-fragment*) + (base-path *gdl-base-path*) + (host-address *gdl-host-address*) + (host-file *gdl-host-file*)) (declare (String get-fragment get-schema commit-fragment delete-fragment host-address)) @@ -58,9 +59,9 @@ hunchentoot:*dispatch-table*)) -(defun init-hosted-files (&key (host-address *host-address*) - (host-file *host-file*) - (base-path *base-path*)) +(defun init-hosted-files (&key (host-address *gdl-host-address*) + (host-file *gdl-host-file*) + (base-path *gdl-base-path*)) "Adds handlers for the css, html and js files needed by the frontend." (declare (String host-address host-file base-path)) ;; add the actual html file @@ -150,7 +151,7 @@ :force-text t))) (with-writer-lock (let ((frag (jtm-importer:import-construct-from-jtm-string - json-data :revision (get-revision)))) + json-data :revision (get-revision) :tm-id *gdl-tm-id*))) (when frag (push-to-cache (d:topic frag))))))) (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+))))

1 0

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

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 00:24:24 2011 New Revision: 864 Log: gdl-frontend: Widgets: fixed a a potential bug in GdlPosition.getOccurrences(...) Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPosition.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPosition.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPosition.java Mon Sep 12 00:10:55 2011 (r863) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPosition.java Mon Sep 12 00:24:24 2011 (r864) @@ -28,10 +28,11 @@ // a helper method that returns all occurrences of the type bound to the passed PSI + @SuppressWarnings("unchecked") private JsArray<Occurrence> getOccurrences(String occurrenceType){ TopicMap tm = this.tmRepresentative.getTopicMap(); Topic occType = tm.getTopicBySubjectIdentifier(tm.createLocator(occurrenceType)); - if(occType == null) return null; + if(occType == null) return (JsArray<Occurrence>)JsArray.createArray(); else return tmRepresentative.getOccurrences(occType); }

1 0

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

12 Sep '11

Author: lgiessmann Date: Mon Sep 12 00:10:55 2011 New Revision: 863 Log: gdl-frontend: Widgets: fixed a a potential bug in TmHelper.hashThemes(...) Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Sun Sep 11 23:31:15 2011 (r862) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Sep 12 00:10:55 2011 (r863) @@ -8,6 +8,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Name; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Role; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Scoped; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.ScopedStub; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; @@ -274,7 +275,7 @@ // returns true if the topics of themes are all equal to the scope of construct - public static boolean hasThemes(Construct construct, ArrayList<Topic> themes){ + public static boolean hasThemes(Scoped construct, ArrayList<Topic> themes){ if(construct == null) return false; if(themes == null) return ((ScopedStub)construct).getScope().length() == 0;

1 0

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

12 Sep '11

Author: lgiessmann Date: Sun Sep 11 23:31:15 2011 New Revision: 862 Log: gdl-frontend: Widgets: changed the test ULR for getting the gdl-schema to the actual backend-URL Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Fri Sep 9 09:22:05 2011 (r861) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Sun Sep 11 23:31:15 2011 (r862) @@ -1,7 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; -import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Window; @@ -9,6 +8,6 @@ public final static String DELETE_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/delete"; public final static String COMMIT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/commit"; public final static String GET_FRAGMENT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/fragment/"; - //public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; - public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; + public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; + //public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; }

1 0

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

09 Sep '11

Author: lgiessmann Date: Fri Sep 9 09:22:05 2011 New Revision: 861 Log: gdl-frontend: Widgets: fixed a a potential bug in TmHelper Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Fri Sep 9 08:27:42 2011 (r860) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Fri Sep 9 09:22:05 2011 (r861) @@ -235,7 +235,7 @@ // returns true if the instance topic is an instance of the topic bound to typeSubectIdentifier public static boolean isInstanceOf(Topic instance, String typeSubjectIdentifier){ - if(instance == null) return false; + if(instance == null || typeSubjectIdentifier == null) return false; TopicMap tm = instance.getTopicMap(); Topic type = tm.getTopicBySubjectIdentifier(tm.createLocator(typeSubjectIdentifier)); return isInstanceOf(instance, type);

1 0

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

09 Sep '11

Author: lgiessmann Date: Fri Sep 9 08:27:42 2011 New Revision: 860 Log: gdl-frontend: Widgets: fixed a a potential bug in TmHelper.hasThemes(...) Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Fri Sep 9 08:25:42 2011 (r859) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Fri Sep 9 08:27:42 2011 (r860) @@ -276,11 +276,9 @@ // returns true if the topics of themes are all equal to the scope of construct public static boolean hasThemes(Construct construct, ArrayList<Topic> themes){ if(construct == null) return false; + if(themes == null) return ((ScopedStub)construct).getScope().length() == 0; ScopedStub scoped = (ScopedStub)construct; - if(scoped.getScope().length() != 0 && (themes == null || themes.size() == 0)) return false; - if(themes != null && scoped.getScope().length() != themes.size()) return false; - for(int i = 0; i != scoped.getScope().length(); ++i){ if(!themes.contains(scoped.getScope().get(i))) return false; }

1 0

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

09 Sep '11

Author: lgiessmann Date: Fri Sep 9 08:25:42 2011 New Revision: 859 Log: gdl-frontend: Widgets: fixed a a potential bug in TmHelper.hasRoles(...) Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Thu Sep 8 07:54:00 2011 (r858) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Fri Sep 9 08:25:42 2011 (r859) @@ -246,7 +246,7 @@ // the array list rolePlayersAndTypes public static boolean hasRoles(Association assoc, ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes){ if(assoc == null) return false; - if(assoc.getRoles().length() == 0 && rolePlayertypesAndTypes == null) return true; + if(rolePlayertypesAndTypes == null) return assoc.getRoles().length() == 0; if(assoc.getRoles().length() != rolePlayertypesAndTypes.size()) return false; for (Pair<Topic, Topic> pair : rolePlayertypesAndTypes) {

1 0

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

08 Sep '11

Author: lgiessmann Date: Thu Sep 8 07:54:00 2011 New Revision: 858 Log: gdl-frontend: Widgets: fixed a bug in the hanlding of GdlHiddenValue in GdlAssociationView instances Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Thu Sep 8 07:47:55 2011 (r857) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Thu Sep 8 07:54:00 2011 (r858) @@ -8,6 +8,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Role; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; @@ -201,14 +202,19 @@ // process hidden values for (Topic hd : this.getHiddenValues()) { GdlHiddenValue hdv = new GdlHiddenValue(hd, this); + Topic player = hdv.getRawTmValue(); + if(player == null) throw new InvalidGdlSchemaException("the hidden value " + TmHelper.getAnyIdOfTopic(hd) + " must be bound to exactly one topic, but is unbound"); + Topic roleType = TmHelper.getConstrainedRoleAndPlayerTypeOfConstraint(hdv.getRootConstraint()).getFirst(); + if(TmHelper.isInstanceOf(hdv.getConstraint(), PSIs.GDL.TopicType.gdlRolePlayer)){ if(!TmHelper.isInstanceOf(hdv.getRootConstraint(), PSIs.TMCL.tmclTopicRoleConstraint)) throw new InvalidGdlSchemaException("the constraint " + TmHelper.getAnyIdOfTopic(hdv.getConstraint()) + " must be bound to an instance of " + PSIs.TMCL.tmclTopicRoleConstraint + ", but is: " + TmHelper.getAnyIdOfTopic(hdv.getRootConstraint())); for (Pair<Construct, TopicMapsTypes> pair : result) { if(pair.getSecond().equals(TopicMapsTypes.Association)){ Association assoc = (Association)pair.getFirst(); - Topic player = hdv.getRawTmValue(); - if(player == null) throw new InvalidGdlSchemaException("the hidden value " + TmHelper.getAnyIdOfTopic(hd) + " must be bound to exactly one topic, but is unbound"); - assoc.createRole(TmHelper.getConstrainedRoleAndPlayerTypeOfConstraint(hdv.getRootConstraint()).getFirst(), player); + JsArray<Role> roles = assoc.getRoles(roleType); + int i = 0; + for( ; i != roles.length(); ++i) if(roles.get(i).getPlayer().equals(player)) break; + if(i == roles.length()) assoc.createRole(roleType, player); } } }

1 0