isidorus-cvs August 2011

isidorus-cvs@common-lisp.net

1 participants
117 discussions

[isidorus-cvs] r703 - trunk/src/json/isidorus-json
by lgiessmann＠common-lisp.net 02 Aug '11

02 Aug '11

Author: lgiessmann Date: Tue Aug 2 05:17:52 2011 New Revision: 703 Log: trunk: improved the performance of 'get-all-psis' Modified: trunk/src/json/isidorus-json/json_exporter.lisp Modified: trunk/src/json/isidorus-json/json_exporter.lisp ============================================================================== --- trunk/src/json/isidorus-json/json_exporter.lisp Tue Aug 2 01:05:59 2011 (r702) +++ trunk/src/json/isidorus-json/json_exporter.lisp Tue Aug 2 05:17:52 2011 (r703) @@ -389,18 +389,14 @@ "returns all topic psis as a json list of the form [[topic-1-psi-1, topic-1-psi-2],[topic-2-psi-1, topic-2-psi-2],...]" (declare (type (or integer null) revision)) - (encode-json-to-string - (remove-if #'null - (map 'list - #'(lambda(psi-list) - (when psi-list - (map 'list #'uri psi-list))) - (map 'list #'psis - (remove-null - (map 'list #'(lambda(top) - (when (find-item-by-revision top revision) - top)) - (get-all-topics revision)))))))) + (let ((psi-lists + (map 'list (lambda(top) + (when (d:find-item-by-revision top revision) + (let ((psis (d:psis top :revision revision))) + (when psis + (map 'list #'d:uri psis))))) + (elephant:get-instances-by-class 'd:TopicC)))) + (json:encode-json-to-string (tools:remove-null psi-lists)))) (defun to-json-string-summary (topic &key (revision *TM-REVISION*))

1 0

[isidorus-cvs] r702 - trunk/playground
by lgiessmann＠common-lisp.net 02 Aug '11

02 Aug '11

Author: lgiessmann Date: Tue Aug 2 01:05:59 2011 New Revision: 702 Log: trunk: playground: replaced string-starts-with and string-ends-with by the correpondings functions defined in 'base-tools' Modified: trunk/playground/tcp-connector.lisp Modified: trunk/playground/tcp-connector.lisp ============================================================================== --- trunk/playground/tcp-connector.lisp Tue Aug 2 00:54:16 2011 (r701) +++ trunk/playground/tcp-connector.lisp Tue Aug 2 01:05:59 2011 (r702) @@ -84,11 +84,11 @@ (handler-case (let ((client-data (read-from-client client-socket))) (let ((response - (cond ((string-starts-with (first (getf client-data :headers)) - "GET /json/psis") + (cond ((tools:string-starts-with (first (getf client-data :headers)) + "GET /json/psis") (get-psis)) - ((string-starts-with (first (getf client-data :headers)) - "GET /json/get/") + ((tools-string-starts-with (first (getf client-data :headers)) + "GET /json/get/") (get-fragment (get-requested-psi-of-http-header (first (getf client-data :headers))))) (t @@ -133,49 +133,15 @@ (defun get-requested-psi-of-http-header (first-header-line) (declare (String first-header-line)) - (when (and (string-starts-with first-header-line "GET /json/get/") - (or (string-ends-with first-header-line "HTTP/1.0") - (string-ends-with first-header-line "HTTP/1.1"))) + (when (and (tools:string-starts-with first-header-line "GET /json/get/") + (or (tools:string-ends-with first-header-line "HTTP/1.0") + (tools:string-ends-with first-header-line "HTTP/1.1"))) (let ((psi (subseq first-header-line (length "GET /json/get/") (- (length first-header-line) (length "HTTP/1.0"))))) (hunchentoot:url-decode (string-trim '(#\space) psi))))) -(defun string-starts-with (str prefix &key (ignore-case nil)) - "Checks if string str starts with a given prefix." - (declare (String str prefix) - (Boolean ignore-case)) - (let ((str-i (if ignore-case - (string-downcase str :start 0 :end (min (length str) - (length prefix))) - str)) - (prefix-i (if ignore-case - (string-downcase prefix) - prefix))) - (string= str-i prefix-i :start1 0 :end1 - (min (length prefix-i) - (length str-i))))) - - -(defun string-ends-with (str suffix &key (ignore-case nil)) - "Checks if string str ends with a given suffix." - (declare (String str suffix) - (Boolean ignore-case)) - (let ((str-i (if ignore-case - (string-downcase str :start (max (- (length str) - (length suffix)) - 0) - :end (length str)) - str)) - (suffix-i (if ignore-case - (string-downcase suffix) - suffix))) - (string= str-i suffix-i :start1 (max (- (length str) - (length suffix)) - 0)))) - - (defun main() (format t ">> entered (main)") (base-tools:open-tm-store "/home/lukas/.sbcl/site/isidorus/trunk/src/data_base")

1 0

[isidorus-cvs] r701 - trunk/playground
by lgiessmann＠common-lisp.net 02 Aug '11

02 Aug '11

Author: lgiessmann Date: Tue Aug 2 00:54:16 2011 New Revision: 701 Log: trunk: playground: implemented an interface that returns all psis and a json fragment via usocket's tcp-sockets - instead of using hunchentoot Modified: trunk/playground/tcp-connector.lisp Modified: trunk/playground/tcp-connector.lisp ============================================================================== --- trunk/playground/tcp-connector.lisp Mon Aug 1 07:56:39 2011 (r700) +++ trunk/playground/tcp-connector.lisp Tue Aug 2 00:54:16 2011 (r701) @@ -9,8 +9,7 @@ ;; source: http://mihai.bazon.net/blog/howto-multi-threaded-tcp-server-in-common-lisp -(asdf:operate 'asdf:load-op :usocket) -(asdf:operate 'asdf:load-op :bordeaux-threads) +(asdf:operate 'asdf:load-op :isidorus) (defun make-server (&key (hostname "localhost") (port 8000)) @@ -71,22 +70,33 @@ (usocket:socket-close client-socket)) -(defun task (client-socket mega-loops name) - (declare (String name) - (integer mega-loops) - (usocket:stream-usocket client-socket)) - (let ((loops (* 1000000 mega-loops))) - (dotimes (counter loops) - (/ (* loops loops) loops)) - (read-from-client client-socket) ;ignore cient data - (send-to-client client-socket (format nil "~a finished ~a loops" name loops)))) +(defvar *stop-listen* nil "if this variable is set to t, the listener stops to listen after the next client has been accepted") -(defvar *stop-listen* nil "if tis variable is set to t, te listener stops to listen after the next client is accepted") +(defun stop-listen-for-clients (server) + (setf *stop-listen* t) + (usocket:socket-close server) + (base-tools:close-tm-store)) -(defun stop-listen-for-clients () - (setf *stop-listen* t)) +(defun client-task (client-socket) + (declare (usocket:stream-usocket client-socket)) + (handler-case + (let ((client-data (read-from-client client-socket))) + (let ((response + (cond ((string-starts-with (first (getf client-data :headers)) + "GET /json/psis") + (get-psis)) + ((string-starts-with (first (getf client-data :headers)) + "GET /json/get/") + (get-fragment (get-requested-psi-of-http-header + (first (getf client-data :headers))))) + (t + (concatenate 'string ">> bad request: ~a~%" + (first (getf client-data :headers))))))) + (send-to-client client-socket response))) + (condition () + (usocket:socket-close client-socket)))) (defun listen-for-clients (server) @@ -99,14 +109,78 @@ (let ((client (wait-for-client srv))) (format t "client # ~a connected~%" counter) (sb-thread:make-thread - (lambda() - (funcall (lambda(client-socket thread-name) - (declare (usocket:stream-usocket client-socket) - (String thread-name)) - (read-from-client client-socket) ;ignore client data - (send-to-client client-socket thread-name)) - client (format nil "thread-~a" counter))) + (lambda() (funcall #'client-task client)) :name (format nil "worker-thread: ~a" counter))) (incf counter) (setf stop-p *stop-listen*))) - server)))) + server)) + :name "server-listener")) + + +(defun get-psis () + (isidorus-threading:with-reader-lock + (json-exporter:get-all-topic-psis :revision 0))) + + +(defun get-fragment(psi) + (let ((fragment (isidorus-threading:with-reader-lock + (d:get-latest-fragment-of-topic psi)))) + (if (and fragment + (d:find-item-by-revision (d:topic fragment) 0)) + (json-exporter:export-construct-as-isidorus-json-string fragment :revision 0) + (concatenate 'string psi " not found")))) + + +(defun get-requested-psi-of-http-header (first-header-line) + (declare (String first-header-line)) + (when (and (string-starts-with first-header-line "GET /json/get/") + (or (string-ends-with first-header-line "HTTP/1.0") + (string-ends-with first-header-line "HTTP/1.1"))) + (let ((psi (subseq first-header-line + (length "GET /json/get/") + (- (length first-header-line) (length "HTTP/1.0"))))) + (hunchentoot:url-decode (string-trim '(#\space) psi))))) + + +(defun string-starts-with (str prefix &key (ignore-case nil)) + "Checks if string str starts with a given prefix." + (declare (String str prefix) + (Boolean ignore-case)) + (let ((str-i (if ignore-case + (string-downcase str :start 0 :end (min (length str) + (length prefix))) + str)) + (prefix-i (if ignore-case + (string-downcase prefix) + prefix))) + (string= str-i prefix-i :start1 0 :end1 + (min (length prefix-i) + (length str-i))))) + + +(defun string-ends-with (str suffix &key (ignore-case nil)) + "Checks if string str ends with a given suffix." + (declare (String str suffix) + (Boolean ignore-case)) + (let ((str-i (if ignore-case + (string-downcase str :start (max (- (length str) + (length suffix)) + 0) + :end (length str)) + str)) + (suffix-i (if ignore-case + (string-downcase suffix) + suffix))) + (string= str-i suffix-i :start1 (max (- (length str) + (length suffix)) + 0)))) + + +(defun main() + (format t ">> entered (main)") + (base-tools:open-tm-store "/home/lukas/.sbcl/site/isidorus/trunk/src/data_base") + (defvar *server* (make-server :port 8080)) + (listen-for-clients *server*)) + + +(main) \ No newline at end of file

1 0

[isidorus-cvs] r700 - trunk/playground
by lgiessmann＠common-lisp.net 01 Aug '11

01 Aug '11

Author: lgiessmann Date: Mon Aug 1 07:56:39 2011 New Revision: 700 Log: trunk: playground: added a client-acceptor function that accepts new client connections and starts a thread for each client Modified: trunk/playground/tcp-connector.lisp Modified: trunk/playground/tcp-connector.lisp ============================================================================== --- trunk/playground/tcp-connector.lisp Mon Aug 1 06:57:28 2011 (r699) +++ trunk/playground/tcp-connector.lisp Mon Aug 1 07:56:39 2011 (r700) @@ -9,6 +9,9 @@ ;; source: http://mihai.bazon.net/blog/howto-multi-threaded-tcp-server-in-common-lisp +(asdf:operate 'asdf:load-op :usocket) +(asdf:operate 'asdf:load-op :bordeaux-threads) + (defun make-server (&key (hostname "localhost") (port 8000)) (declare (string hostname) (number port)) @@ -68,3 +71,42 @@ (usocket:socket-close client-socket)) +(defun task (client-socket mega-loops name) + (declare (String name) + (integer mega-loops) + (usocket:stream-usocket client-socket)) + (let ((loops (* 1000000 mega-loops))) + (dotimes (counter loops) + (/ (* loops loops) loops)) + (read-from-client client-socket) ;ignore cient data + (send-to-client client-socket (format nil "~a finished ~a loops" name loops)))) + + +(defvar *stop-listen* nil "if tis variable is set to t, te listener stops to listen after the next client is accepted") + + +(defun stop-listen-for-clients () + (setf *stop-listen* t)) + + +(defun listen-for-clients (server) + (declare (usocket:stream-server-usocket server)) + (setf *stop-listen* nil) + (sb-thread:make-thread + (lambda() + (funcall (lambda(srv) + (do ((stop-p *stop-listen*) (counter 0)) ((not (null stop-p))) + (let ((client (wait-for-client srv))) + (format t "client # ~a connected~%" counter) + (sb-thread:make-thread + (lambda() + (funcall (lambda(client-socket thread-name) + (declare (usocket:stream-usocket client-socket) + (String thread-name)) + (read-from-client client-socket) ;ignore client data + (send-to-client client-socket thread-name)) + client (format nil "thread-~a" counter))) + :name (format nil "worker-thread: ~a" counter))) + (incf counter) + (setf stop-p *stop-listen*))) + server))))

1 0

[isidorus-cvs] r699 - trunk/playground
by lgiessmann＠common-lisp.net 01 Aug '11

01 Aug '11

Author: lgiessmann Date: Mon Aug 1 06:57:28 2011 New Revision: 699 Log: trunk: playground: added an interface to accept tcp-client-connections, receive data from clients and send data to clients Added: trunk/playground/tcp-connector.lisp Added: trunk/playground/tcp-connector.lisp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/playground/tcp-connector.lisp Mon Aug 1 06:57:28 2011 (r699) @@ -0,0 +1,70 @@ +;;+----------------------------------------------------------------------------- +;;+ Isidorus +;;+ (c) 2008-2010 Marc Kuester, Christoph Ludwig, Lukas Georgieff +;;+ +;;+ Isidorus is freely distributable under the LLGPL license. +;;+ You can find a detailed description in trunk/docs/LLGPL-LICENSE.txt and +;;+ trunk/docs/LGPL-LICENSE.txt. +;;+----------------------------------------------------------------------------- + +;; source: http://mihai.bazon.net/blog/howto-multi-threaded-tcp-server-in-common-lisp + + +(defun make-server (&key (hostname "localhost") (port 8000)) + (declare (string hostname) (number port)) + (usocket:socket-listen hostname port :reuse-address t)) + + +(defun wait-for-client (server-socket) + (declare (usocket:stream-server-usocket server-socket)) + (usocket:wait-for-input server-socket) + (usocket:socket-accept server-socket)) + + +(defun read-from-client (client-socket) + (declare (usocket:stream-usocket client-socket)) + (let* ((header (read-tcp-header (usocket:socket-stream client-socket))) + (payload (read-tcp-payload (usocket:socket-stream client-socket) header))) + (list :headers header + :payload payload))) + + +(defun read-tcp-header (stream) + (declare (Stream stream)) + (let ((line (string-right-trim (list #\cr) (read-line stream)))) + (if (string= "" line) + (list "") + (progn + (append (list line) (read-tcp-header stream)))))) + + +(defun read-tcp-payload (stream header-list) + (declare (Stream stream) + (list header-list)) + (let ((content-length + (let ((val + (loop for line in header-list + when (search "content-length:" (string-downcase line) :test #'string=) + return (let ((value (subseq line (length "content-length:")))) + (parse-integer value))))) + (if val val 0))) + (payload "")) + (dotimes (idx content-length payload) + (setf payload (concatenate 'string payload (string (read-char stream))))))) + + +(defun send-to-client (client-socket message-string &key (content-type "text/plain")) + (declare (usocket:stream-usocket client-socket) + (String message-string content-type)) + (format (usocket:socket-stream client-socket) + "~a~c~c~a~a~c~c~a~a~c~c~a~c~c~c~c~a" + "HTTP/1.1 200 OK" #\return #\newline + "Content-Length: " (write-to-string (length message-string)) #\return #\newline + "Content-Type: " content-type #\return #\newline + "Connection: close" #\return #\newline + #\return #\newline + message-string) + (force-output (usocket:socket-stream client-socket)) + (usocket:socket-close client-socket)) + +

1 0

[isidorus-cvs] r698 - trunk/src/threading
by lgiessmann＠common-lisp.net 01 Aug '11

01 Aug '11

Author: lgiessmann Date: Mon Aug 1 03:39:45 2011 New Revision: 698 Log: trunk: replaced the bordeaux-threads mehtods for using mutexes/locks by the interface of sb-thread Modified: trunk/src/threading/reader-writer.lisp Modified: trunk/src/threading/reader-writer.lisp ============================================================================== --- trunk/src/threading/reader-writer.lisp Mon Aug 1 01:29:59 2011 (r697) +++ trunk/src/threading/reader-writer.lisp Mon Aug 1 03:39:45 2011 (r698) @@ -8,39 +8,38 @@ ;;+----------------------------------------------------------------------------- (defpackage :isidorus-threading - (:use :cl :bordeaux-threads) + (:use :cl :sb-thread) (:export :current-readers :with-reader-lock :with-writer-lock)) (in-package :isidorus-threading) -(defvar *readerlist-lock* (make-lock "isidorus-threading: current readers lock")) -(defvar *writer-lock* (make-lock "isidorus-threading: writer lock")) +(defvar *readerlist-lock* (make-mutex :name "isidorus-threading: current readers lock")) +(defvar *writer-lock* (make-mutex :name "isidorus-threading: writer lock")) (defvar *current-readers* nil) (defun current-readers () "Returns a copy of the list which contains all current reader threads, *current-readers*" - (let ((result nil)) - (with-lock-held (*readerlist-lock*) - (setf result (copy-list *current-readers*))) - result)) + (with-mutex (*readerlist-lock*) + (copy-list *current-readers*))) + (defun add-thread-to-reader-list () "Adds the current thread to the reader list" - (with-lock-held (*writer-lock*) - (with-lock-held (*readerlist-lock*) - (push (current-thread) *current-readers*)))) + (with-mutex (*writer-lock*) + (with-mutex (*readerlist-lock*) + (push *current-thread* *current-readers*)))) (defun remove-thread-from-reader-list () "Removes the current threads from the reader list" - (with-lock-held (*readerlist-lock*) + (with-mutex (*readerlist-lock*) (setf *current-readers* - (delete (current-thread) *current-readers*)))) + (delete *current-thread* *current-readers*)))) (defmacro with-reader-lock (&body body) @@ -61,7 +60,7 @@ (defmacro with-writer-lock (&body body) "Executes the passed body when the reader list is empty otherwise the do macor loops in 500 ms time interval for a next chance." - `(with-lock-held (*writer-lock*) + `(with-mutex (*writer-lock*) (do ((remaining-readers (current-readers) (current-readers))) ((null remaining-readers))

1 0

[isidorus-cvs] r697 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets/base war/gdl_widgets
by lgiessmann＠common-lisp.net 01 Aug '11

01 Aug '11

Author: lgiessmann Date: Mon Aug 1 01:29:59 2011 New Revision: 697 Log: gdl-frontend: Widgets: implemented the method GdlText.getTmValueForScopeConstraint() Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Sun Jul 31 09:19:10 2011 (r696) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Mon Aug 1 01:29:59 2011 (r697) @@ -11,7 +11,6 @@ public final static String supertype = tmdm + "supertype"; public final static String subtype = tmdm + "subtype"; public final static String supertypeSubtype = tmdm + "supertype-subtype"; - } @@ -37,6 +36,7 @@ public final static String tmclAllows = tmcl + "allows"; public final static String tmclAllowed = tmcl + "allowed"; public final static String tmclAllowedReifier = tmcl + "allowed-reifier"; + public final static String tmclConstrainedScope = tmcl + "constrained-scope"; } 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 Jul 31 09:19:10 2011 (r696) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Aug 1 01:29:59 2011 (r697) @@ -748,11 +748,22 @@ // returns the topic that can be used to satisfy the passed role-player-constraint. - public static ArrayList<Topic> getTmValuesForScopeConstraint(Topic scopeConstraint){ + public static ArrayList<Topic> getTmValuesForScopeConstraint(Topic scopeConstraint) throws InvalidGdlSchemaException { ArrayList<Topic> result = new ArrayList<Topic>(); if(scopeConstraint == null) return result; - // TODO: implement - + + TopicMap tm = scopeConstraint.getTopicMap(); + Topic constraintRoleType = getTopicByPsi(GdlPsis.TMCL.tmclConstraint, tm); + Topic constrainedScopeAssocType = getTopicByPsi(GdlPsis.TMCL.tmclConstrainedScope, tm); + Topic constrainedRoleType = getTopicByPsi(GdlPsis.TMCL.tmclConstrained, tm); + ArrayList<Topic> scopeTypes = getOtherPlayerOfBinaryAssociation(scopeConstraint, constraintRoleType, constrainedScopeAssocType, null, constrainedRoleType); + + if(scopeTypes.size() != 1){ + throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(scopeConstraint) + " must be bound to exaclty one topic type that is used as scope-type, but is: " + scopeTypes.size()); + } else { + JsArray<Topic> allTopics = tm.getTopics(); + for(int i = 0; i != allTopics.length(); ++i) if(isInstanceOf(allTopics.get(i), scopeTypes.get(0))) result.add(allTopics.get(i)); + } return result; } @@ -807,6 +818,9 @@ if(typeTopics.size() != 1){ throw new InvalidGdlSchemaException("the constraint " + getAnyIdOfTopic(rootConstraint) + " must be bound extactly once to an occurrence or name type, but is: " + typeTopics.size()); } else { + // add the direct specified type + result.add(typeTopics.get(0)); + // get subtypes of typeTopic JsArray<Topic> allTopics = tm.getTopics(); for(int i = 0; i != allTopics.length(); ++i) if(isSupertypeOf(allTopics.get(i), typeTopics.get(0))) result.add(allTopics.get(i)); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Sun Jul 31 09:19:10 2011 (r696) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Mon Aug 1 01:29:59 2011 (r697) @@ -37,13 +37,17 @@ {"subject_identifiers":["[tmcl:allows]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[doc:poet-name]"]}, {"subject_identifiers":["[doc:unused-person-name-reifier]"], "instance_of":["si:[doc:Reifier-Type]"]}, + {"subject_identifiers":["[doc:unused-person-name-scope]"], "instance_of":["si:[doc:Scope-Type]"]}, {"subject_identifiers":["[doc:Reifier-Type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[doc:Scope-Type]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[doc:musician-name]"]}, {"subject_identifiers":["[doc:director-name]"]}, {"subject_identifiers":["[gdl:Visible-Object]"]}, {"subject_identifiers":["[tmcl:constraint]"], "instance_of":["si:[tmcl:topic-type]","si:[tmcl:role-type]"]}, {"subject_identifiers":["[tmcl:reifier-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:scope-constraint]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[tmcl:constrained]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tmcl:constrained-scope]"], "instance_of":["si:[tmcl:association-type]"]}, {"subject_identifiers":["[tmcl:constrained-statement]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[tmcl:constrained-topic-type]"], "instance_of":["si:[tmcl:role-type]"]}, {"subject_identifiers":["[gdl:value]"], "instance_of":["si:[tmcl:role-type]"]}, @@ -109,6 +113,7 @@ {"subject_identifiers":["[doc:person-name-type-constraint]"], "instance_of":["si:[gdl:Type]"]}, {"subject_identifiers":["[doc:person-name-constraint]"], "instance_of":["si:[tmcl:topic-name-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, {"subject_identifiers":["[doc:person-name-reifier-constraint]"], "instance_of":["si:[tmcl:reifier-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"1"}, {"type":"si:[tmcl:card-max]", "value":"1"}]}, + {"subject_identifiers":["[doc:person-name-scope-constraint]"], "instance_of":["si:[tmcl:scope-constraint]"], "occurrences":[{"type":"si:[tmcl:card-min]", "value":"0"}, {"type":"si:[tmcl:card-max]", "value":"2"}]}, {"subject_identifiers":["[doc:person-name-regexp-constraint]"], "instance_of":["si:[tmcl:regular-expression-constraint]"], "occurrences":[{"type":"si:[tmcl:regexp]", "value":"^[A-Z][a-z]+ [A-Z][a-z]+$"}]}, {"subject_identifiers":["[doc:unit-1-radio-button]"], "instance_of":["si:[gdl:Radio-Button]"], "occurrences":[{"type":"si:[gdl:id]", "value":"unit_1_radio_button_id"},{"type":"si:[gdl:content-orientation]", "value":"horizontal"}, {"type":"si:[gdl:background-color]", "value": "lime"}, {"type":"si:[gdl:margin-left]", "value":"15pt"}, {"type":"si:[gdl:font-size]", "value":"8pt"}]}, {"subject_identifiers":["[doc:unit-1-check-box]"], "instance_of":["si:[gdl:Check-Box]"], "occurrences":[{"type":"si:[gdl:id]", "value":"unit_1_check_box_id"},{"type":"si:[gdl:content-orientation]", "value":"vertical"}, {"type":"si:[gdl:background-color]", "value": "lime"}, {"type":"si:[gdl:margin]", "value":"30pt"}, {"type":"si:[gdl:font-size]", "value":"8pt"}]}, @@ -235,6 +240,7 @@ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[doc:Person]"},{"type":"si:[tmdm:subtype]", "player":"si:[doc:Musician]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:regular-expression-constraint]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:reifier-constraint]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[tmcl:constraint]"},{"type":"si:[tmdm:subtype]", "player":"si:[tmcl:scope-constraint]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:test-schema]"},{"type":"si:[gdl:containee]", "player":"si:[doc:default-creator-topic-view-1]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:test-schema]"},{"type":"si:[gdl:containee]", "player":"si:[doc:default-creator-topic-view-2]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:test-schema]"},{"type":"si:[gdl:containee]", "player":"si:[doc:default-editor-topic-view]"}]}, @@ -294,5 +300,6 @@ {"type":"si:[tmcl:constrained-topic-type]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[doc:person-name-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[doc:Person]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[doc:person-name-regexp-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[doc:person-name]"}]}, {"type":"si:[tmcl:constrained-statement]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[doc:person-name-reifier-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[doc:person-name]"}]}, - {"type":"si:[tmcl:allowed-reifier]", "roles":[{"type":"si:[tmcl:allowed]", "player":"si:[doc:Reifier-Type]"},{"type":"si:[tmcl:allows]", "player":"si:[doc:person-name-reifier-constraint]"}]} + {"type":"si:[tmcl:allowed-reifier]", "roles":[{"type":"si:[tmcl:allowed]", "player":"si:[doc:Reifier-Type]"},{"type":"si:[tmcl:allows]", "player":"si:[doc:person-name-reifier-constraint]"}]}, + {"type":"si:[tmcl:constrained-scope]", "roles":[{"type":"si:[tmcl:constraint]", "player":"si:[doc:person-name-scope-constraint]"},{"type":"si:[tmcl:constrained]", "player":"si:[doc:Scope-Type]"}]} ]} \ No newline at end of file

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

isidorus-cvs August 2011