July 2011 - isidorus-cvs@common-lisp.net - mailman3.common-lisp.net

[isidorus-cvs] r646 - in trunk/src: rest_interface shell_scripts
by lgiessmann＠common-lisp.net 19 Jul '11

19 Jul '11

Author: lgiessmann Date: Tue Jul 19 05:52:35 2011 New Revision: 646 Log: trunk: added a handler that sends the backup xtm data via http to the requestor; added a corresponding bash script Added: trunk/src/shell_scripts/local-backup-isidorus.sh - copied, changed from r638, trunk/src/shell_scripts/backup-isidorus.sh trunk/src/shell_scripts/remote-backup-isidorus.sh (contents, props changed) Deleted: trunk/src/shell_scripts/backup-isidorus.sh Modified: trunk/src/rest_interface/admin-interface.lisp trunk/src/rest_interface/rest-interface.lisp Modified: trunk/src/rest_interface/admin-interface.lisp ============================================================================== --- trunk/src/rest_interface/admin-interface.lisp Tue Jul 19 02:00:42 2011 (r645) +++ trunk/src/rest_interface/admin-interface.lisp Tue Jul 19 05:52:35 2011 (r646) @@ -11,15 +11,17 @@ ;;TODO: add functions to export statement -;the prefix to get a fragment by the psi -> localhost:8000/json/get/<fragment-psi> -(defparameter *admin-backup* "/admin/backup") -;the prefix to get a fragment by the psi -> localhost:8000/json/rdf/get/<fragment-psi> +(defparameter *admin-local-backup* "/admin/local-backup") +(defparameter *admin-remote-backup* "/admin/remote-backup") (defparameter *admin-shutdown* "/admin/shutdown") (defun set-up-admin-interface () (push - (create-regex-dispatcher *admin-backup* #'admin-backup) + (create-regex-dispatcher *admin-local-backup* #'admin-local-backup) + hunchentoot:*dispatch-table*) + (push + (create-regex-dispatcher *admin-remote-backup* #'admin-remote-backup) hunchentoot:*dispatch-table*) (push (create-regex-dispatcher *admin-shutdown* #'admin-shutdown) @@ -51,14 +53,26 @@ -(defun admin-backup() +(defun admin-local-backup() (handler-case (if (string= "127.0.0.1" (hunchentoot:remote-addr*)) (let ((destination-path (hunchentoot:url-decode (hunchentoot:get-parameter "path")))) - (xtm-exporter:export-as-xtm destination-path - :tm-id "http://isidor.us/backup-tm" - :revision 0)) + (xtm-exporter:export-as-xtm destination-path :revision 0)) + (setf (hunchentoot:return-code*) hunchentoot:+http-forbidden+)) + (condition (err) + (progn + (setf (hunchentoot:return-code*) hunchentoot:+http-internal-server-error+) + (setf (hunchentoot:content-type*) "text") + (format nil "Condition: \"~a\"" err))))) + + +(defun admin-remote-backup() + (handler-case + (if (string= "127.0.0.1" (hunchentoot:remote-addr*)) + (progn (hunchentoot:url-decode (hunchentoot:get-parameter "path")) + (setf (hunchentoot:content-type*) "application/xml") + (xtm-exporter:export-as-xtm-string :revision 0)) (setf (hunchentoot:return-code*) hunchentoot:+http-forbidden+)) (condition (err) (progn Modified: trunk/src/rest_interface/rest-interface.lisp ============================================================================== --- trunk/src/rest_interface/rest-interface.lisp Tue Jul 19 02:00:42 2011 (r645) +++ trunk/src/rest_interface/rest-interface.lisp Tue Jul 19 05:52:35 2011 (r646) @@ -33,6 +33,9 @@ :start-admin-server :shutdown-json-engine :shutdown-atom-engine + :*admin-local-backup* + :*admin-remote-backup* + :*admin-shutdown* :shutdown-admin-server :*admin-host-name* :*admin-port* Copied and modified: trunk/src/shell_scripts/local-backup-isidorus.sh (from r638, trunk/src/shell_scripts/backup-isidorus.sh) ============================================================================== --- trunk/src/shell_scripts/backup-isidorus.sh Mon Jul 18 05:08:51 2011 (r638, copy source) +++ trunk/src/shell_scripts/local-backup-isidorus.sh Tue Jul 19 05:52:35 2011 (r646) @@ -18,9 +18,9 @@ ## value is a date string of the form dd.mm.yyyy:hh:mm:ss.xtm" and can be ## changed by using the switch -path <any-string>. ## A sample call would be -## ./backup-isidorus.sh -host 12.34.56.78 -url /admin/shutdown -path=backup.xtm +## ./local-backup-isidorus.sh -host 12.34.56.78 -url /admin/shutdown -path=backup.xtm -url="/admin/backup"; +url="/admin/local-backup"; host="127.0.0.1:11008"; path=`date +"%d.%m.%y:%H:%M:%S"`".xtm" Added: trunk/src/shell_scripts/remote-backup-isidorus.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/shell_scripts/remote-backup-isidorus.sh Tue Jul 19 05:52:35 2011 (r646) @@ -0,0 +1,105 @@ +#!/bin/bash +##+----------------------------------------------------------------------------- +##+ 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. +##+----------------------------------------------------------------------------- + + +## This script can be used to invoke hunchentoot's admin interface and backup +## the server date. The default ip address is set to 127.0.0.1 and can be changed via +## the switch -host <ip-address>. The default url that determines the server's +## callback binding is set to /admin/backup, but this behavior can also be +## changed by using the switch -url <url-fragment>. The path variable +## contains the name of the stored xtm backup file that is created, the default +## value is a date string of the form dd.mm.yyyy:hh:mm:ss.xtm" and can be +## changed by using the switch -path <any-string>. +## A sample call would be +## ./remote-backup-isidorus.sh -host 12.34.56.78 -url /admin/shutdown -path=backup.xtm + +url="/admin/remote-backup"; +host="127.0.0.1:11008"; +path=`date +"%d.%m.%y:%H:%M:%S"`".xtm" + +if [ $# -eq 0 ]; then + : +elif [ $# -eq 1 -a $1 = "?" ]; then + echo "you can pass the arguments -host <host-url>, -url </url-fragment> and -path <any-string>, if no arguments are passed the default values 127.0.0.1:11008, /admin/backup and <current-data>.xtm are used"; + exit; +elif [ $# -eq 2 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + elif [ $1 = "-path" ]; then + path=$2; + else + echo "only the arguments -host, -url and -path are supported, use ? for more information"; + exit; + fi +elif [ $# -eq 4 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + elif [ $1 = "-path" ]; then + path=$2; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi + + if [ $3 = "-host" ]; then + host=$4; + elif [ $3 = "-url" ]; then + url=$4; + elif [ $3 = "-path" ]; then + path=$4; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi +elif [ $# -eq 6 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + elif [ $1 = "-path" ]; then + path=$2; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi + + if [ $3 = "-host" ]; then + host=$4; + elif [ $3 = "-url" ]; then + url=$4; + elif [ $3 = "-path" ]; then + path=$4; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi + if [ $5 = "-host" ]; then + host=$6; + elif [ $5 = "-url" ]; then + url=$6; + elif [ $5 = "-path" ]; then + path=$6; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi +else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; +fi + + + + +curl $host$url -o $path \ No newline at end of file

1 0

[isidorus-cvs] r645 - trunk/src/json/isidorus-json
by lgiessmann＠common-lisp.net 19 Jul '11

19 Jul '11

Author: lgiessmann Date: Tue Jul 19 02:00:42 2011 New Revision: 645 Log: trunk: fixed a bug in the json format when creating a storage overview Modified: trunk/src/json/isidorus-json/json_tmcl.lisp Modified: trunk/src/json/isidorus-json/json_tmcl.lisp ============================================================================== --- trunk/src/json/isidorus-json/json_tmcl.lisp Tue Jul 19 01:28:04 2011 (r644) +++ trunk/src/json/isidorus-json/json_tmcl.lisp Tue Jul 19 02:00:42 2011 (r645) @@ -1715,8 +1715,7 @@ (error "From make-tree-view(): The topictype-constraint \"~a\" exists but the topictype \"~a\" is missing!" *topictype-constraint-psi* *topictype-psi*)) - (let ((lst (remove-null (make-nodes topictype t t :revision revision)))) - (if lst (list lst) nil))) + (list (make-nodes topictype t t :revision revision))) (let ((tree-roots (get-all-tree-roots :revision revision))) (let ((tree-list

1 0

[isidorus-cvs] r644 - in trunk/src: json/isidorus-json rest_interface
by lgiessmann＠common-lisp.net 19 Jul '11

19 Jul '11

Author: lgiessmann Date: Tue Jul 19 01:28:04 2011 New Revision: 644 Log: trunk: fixed some handler that return a storage snapshot => mark-as-deleted topics are not shown yet Modified: trunk/src/json/isidorus-json/json_exporter.lisp trunk/src/json/isidorus-json/json_tmcl.lisp trunk/src/rest_interface/set-up-json-interface.lisp Modified: trunk/src/json/isidorus-json/json_exporter.lisp ============================================================================== --- trunk/src/json/isidorus-json/json_exporter.lisp Tue Jul 19 01:01:12 2011 (r643) +++ trunk/src/json/isidorus-json/json_exporter.lisp Tue Jul 19 01:28:04 2011 (r644) @@ -395,7 +395,12 @@ #'(lambda(psi-list) (when psi-list (map 'list #'uri psi-list))) - (map 'list #'psis (get-all-topics revision)))))) + (map 'list #'psis + (remove-null + (map 'list #'(lambda(top) + (when (find-item-by-revision top revision) + top)) + (get-all-topics revision)))))))) (defun to-json-string-summary (topic &key (revision *TM-REVISION*)) Modified: trunk/src/json/isidorus-json/json_tmcl.lisp ============================================================================== --- trunk/src/json/isidorus-json/json_tmcl.lisp Tue Jul 19 01:01:12 2011 (r643) +++ trunk/src/json/isidorus-json/json_tmcl.lisp Tue Jul 19 01:28:04 2011 (r644) @@ -1715,7 +1715,8 @@ (error "From make-tree-view(): The topictype-constraint \"~a\" exists but the topictype \"~a\" is missing!" *topictype-constraint-psi* *topictype-psi*)) - (list (make-nodes topictype t t :revision revision))) + (let ((lst (remove-null (make-nodes topictype t t :revision revision)))) + (if lst (list lst) nil))) (let ((tree-roots (get-all-tree-roots :revision revision))) (let ((tree-list @@ -1733,8 +1734,8 @@ (valid-instance-p root nil nil revision) t) (Condition () nil)))) - (make-nodes root l-is-type l-is-instance - :revision revision))))) + (remove-null (make-nodes root l-is-type l-is-instance + :revision revision)))))) tree-list))))) @@ -1794,74 +1795,76 @@ :subtypes <nodes>)." (declare (TopicC topic-instance) (type (or integer null) revision)) - (let ((topictype (get-item-by-psi *topictype-psi* :revision revision)) - (topictype-constraint (is-type-constrained :revision revision))) - (let ((isas-of-this - (map - 'list - #'(lambda(z) - (let ((l-is-type - (handler-case - (progn - (topictype-p z topictype topictype-constraint - nil revision) - t) - (Condition () nil))) - (l-is-instance - (handler-case (progn - (valid-instance-p z nil nil revision) - t) - (Condition () nil)))) - (list :topic z :is-type l-is-type :is-instance l-is-instance))) - (remove-duplicates - (remove-if #'null - (remove-if - #'(lambda(x) (when (eql topic-instance x) - t)) - (get-direct-instances-of-topic topic-instance - :revision revision)))))) - (akos-of-this - (map 'list - #'(lambda(z) - (let ((l-is-type - (handler-case - (progn - (topictype-p z topictype topictype-constraint - nil revision) - t) - (Condition () nil))) - (l-is-instance - (handler-case (progn - (valid-instance-p z nil nil revision) - t) - (Condition () nil)))) - (list :topic z :is-type l-is-type :is-instance l-is-instance))) - (remove-duplicates - (remove-if - #'null - (remove-if #'(lambda(x) (when (eql topic-instance x) - t)) - (get-direct-subtypes-of-topic topic-instance - :revision revision))))))) - (let ((cleaned-isas ;;all constraint topics are removed - (clean-topic-entries isas-of-this :revision revision)) - (cleaned-akos ;;all constraint topics are removed - (clean-topic-entries akos-of-this :revision revision))) - (list :topic topic-instance - :is-type is-type - :is-instance is-instance - :instances (map 'list #'(lambda(x) - (make-nodes (getf x :topic) - (getf x :is-type) - (getf x :is-instance) - :revision revision)) - cleaned-isas) - :subtypes (map 'list #'(lambda(x) - (make-nodes (getf x :topic) - (getf x :is-type) - (getf x :is-instance) - :revision revision)) - cleaned-akos)))))) + (when (find-item-by-revision topic-instance revision) + (let ((topictype (get-item-by-psi *topictype-psi* :revision revision)) + (topictype-constraint (is-type-constrained :revision revision))) + (let ((isas-of-this + (map + 'list + #'(lambda(z) + (let ((l-is-type + (handler-case + (progn + (topictype-p z topictype topictype-constraint + nil revision) + t) + (Condition () nil))) + (l-is-instance + (handler-case (progn + (valid-instance-p z nil nil revision) + t) + (Condition () nil)))) + (list :topic z :is-type l-is-type :is-instance l-is-instance))) + (remove-duplicates + (remove-null + (remove-if + #'(lambda(x) (when (eql topic-instance x) + t)) + (get-direct-instances-of-topic topic-instance + :revision revision)))))) + (akos-of-this + (map 'list + #'(lambda(z) + (let ((l-is-type + (handler-case + (progn + (topictype-p z topictype topictype-constraint + nil revision) + t) + (Condition () nil))) + (l-is-instance + (handler-case (progn + (valid-instance-p z nil nil revision) + t) + (Condition () nil)))) + (list :topic z :is-type l-is-type :is-instance l-is-instance))) + (remove-duplicates + (remove-null + (remove-if #'(lambda(x) (when (eql topic-instance x) + t)) + (get-direct-subtypes-of-topic topic-instance + :revision revision))))))) + (let ((cleaned-isas ;;all constraint topics are removed + (clean-topic-entries isas-of-this :revision revision)) + (cleaned-akos ;;all constraint topics are removed + (clean-topic-entries akos-of-this :revision revision))) + (list :topic topic-instance + :is-type is-type + :is-instance is-instance + :instances (remove-null + (map 'list #'(lambda(x) + (make-nodes (getf x :topic) + (getf x :is-type) + (getf x :is-instance) + :revision revision)) + cleaned-isas)) + :subtypes (remove-null + (map 'list #'(lambda(x) + (make-nodes (getf x :topic) + (getf x :is-type) + (getf x :is-instance) + :revision revision)) + cleaned-akos)))))))) (defun clean-topic-entries(isas-or-akos &key (revision *TM-REVISION*)) Modified: trunk/src/rest_interface/set-up-json-interface.lisp ============================================================================== --- trunk/src/rest_interface/set-up-json-interface.lisp Tue Jul 19 01:01:12 2011 (r643) +++ trunk/src/rest_interface/set-up-json-interface.lisp Tue Jul 19 01:28:04 2011 (r644) @@ -177,7 +177,7 @@ "Returns all topic-psi that are valid types -> so they have to be valid to the topictype-constraint (if it exists) and the can't be abstract." (declare (ignorable param)) - (handler-case (let ((topic-types + (handler-case (let ((topic-types (with-reader-lock (map 'list #'(lambda (oid) (elephant::controller-recreate-instance @@ -290,7 +290,9 @@ (defun return-json-fragment(&optional psi) - "returns the json-fragmen belonging to the psi passed by the parameter psi" + "returns the json-fragmen belonging to the psi passed by the parameter psi. + If the topic is marked as deleted the corresponding fragment is treated + as non-existent and an HTTP 404 is set." (assert psi) (let ((http-method (hunchentoot:request-method*))) (if (eq http-method :GET) @@ -299,7 +301,8 @@ (let ((fragment (with-reader-lock (get-latest-fragment-of-topic identifier)))) - (if fragment + (if (and fragment + (find-item-by-revision (topic fragment) 0)) (handler-case (with-reader-lock (export-construct-as-isidorus-json-string fragment :revision 0)) @@ -325,7 +328,8 @@ (let ((fragment (with-reader-lock (get-latest-fragment-of-topic identifier)))) - (if fragment + (if (and fragment + (find-item-by-revision (topic fragment) 0)) (handler-case (with-reader-lock (rdf-exporter:to-rdf-string fragment)) (condition (err) @@ -372,8 +376,13 @@ (handler-case (parse-integer (hunchentoot:get-parameter "end")) (condition () nil)))) (handler-case (with-reader-lock - (let ((topics - (elephant:get-instances-by-class 'd:TopicC))) + (let ((topics + (remove-null + (map 'list + #'(lambda(top) + (when (find-item-by-revision top 0) + top)) + (elephant:get-instances-by-class 'd:TopicC))))) (let ((end (cond ((not end-idx)

1 0

[isidorus-cvs] r643 - trunk/src/model
by lgiessmann＠common-lisp.net 19 Jul '11

19 Jul '11

Author: lgiessmann Date: Tue Jul 19 01:01:12 2011 New Revision: 643 Log: trunk: changed the behavior of deleting topics => all constructs that are typed or scoped by a topic that is getting to be marked-as-deleted are marked-as-deleted as well. If a typed or scoped role is getting deleted, the entire parental association is marked-as-deleted; fixed a bug when deleting scoped and typed constructs. Modified: trunk/src/model/datamodel.lisp Modified: trunk/src/model/datamodel.lisp ============================================================================== --- trunk/src/model/datamodel.lisp Mon Jul 18 13:30:16 2011 (r642) +++ trunk/src/model/datamodel.lisp Tue Jul 19 01:01:12 2011 (r643) @@ -1577,22 +1577,72 @@ (psis top :revision 0)))) (mapc (lambda(psi)(mark-as-deleted psi :revision revision :source-locator source-locator)) - (psis top :revision 0)) + (psis top :revision revision)) (mapc (lambda(sl)(mark-as-deleted sl :revision revision :source-locator source-locator)) - (locators top :revision 0)) + (locators top :revision revision)) + (mapc (lambda(ii)(mark-as-deleted ii :revision revision + :source-locator source-locator)) + (item-identifiers top :revision revision)) (mapc (lambda (name) (mark-as-deleted name :revision revision :source-locator source-locator)) - (names top :revision 0)) + (names top :revision revision)) (mapc (lambda (occ) (mark-as-deleted occ :revision revision :source-locator source-locator)) - (occurrences top :revision 0)) + (occurrences top :revision revision)) (mapc (lambda (ass) (mark-as-deleted ass :revision revision :source-locator source-locator)) (find-all-associations top :revision 0)) + (let ((ref (reified-construct top :revision revision))) + (when ref + (private-delete-reified-construct top ref :revision revision))) + (dolist (typable (used-as-type top :revision revision)) + (private-delete-typable typable :source-locator source-locator + :revision revision)) + (dolist (scopable (used-as-theme top :revision revision)) + (private-delete-scopable scopable :source-locator source-locator + :revision revision)) (call-next-method))) +(defgeneric private-delete-scopable (construct &key source-locator revision) + (:documentation "This method should be called when a topic that is used + as a theme for the passed construct is getting + marked-as-deleted, i.e. all scopable constructs, scoped + by the deleted topic are marked-as-deleted as well. + If the passed construct is a role the entire parent + association is deleted, otherwise only the construct itself.") + (:method ((construct ScopableC) &key source-locator revision) + (if (typep construct 'RoleC) + (let ((assoc (parent construct :revision revision))) + (if assoc + (mark-as-deleted assoc :source-locator source-locator + :revision revision) + (mark-as-deleted construct :source-locator source-locator + :revision revision))) + (mark-as-deleted construct :source-locator source-locator + :revision revision)))) + + +(defgeneric private-delete-typable (construct &key source-locator revision) + (:documentation "This method should be called when a topic that is used + as a type for the passed construct is getting + marked-as-deleted, i.e. all typable constructs, typed + by the deleted topic are marked-as-deleted as well. + If the passed construct is a role the entire parent + association is deleted, otherwise only the construct itself.") + (:method ((construct TypableC) &key source-locator revision) + (if (typep construct 'RoleC) + (let ((assoc (parent construct :revision revision))) + (if assoc + (mark-as-deleted assoc :source-locator source-locator + :revision revision) + (mark-as-deleted construct :source-locator source-locator + :revision revision))) + (mark-as-deleted construct :source-locator source-locator + :revision revision)))) + + (defmethod equivalent-constructs ((construct-1 TopicC) (construct-2 TopicC) &key (revision *TM-REVISION*)) (declare (integer revision)) @@ -2350,9 +2400,14 @@ "Marks the last active relation between a characteristic and its parent topic as deleted." (declare (ignorable source-locator)) - (let ((owner (parent construct :revision 0))) + (let ((owner (parent construct :revision revision)) + (type-top (instance-of construct :revision revision))) (when owner - (private-delete-characteristic owner construct :revision revision)))) + (private-delete-characteristic owner construct :revision revision)) + (when type-top + (private-delete-type construct type-top :revision revision)) + (dolist (theme (themes construct :revision revision)) + (private-delete-theme construct theme :revision revision)))) (defmethod marked-as-deleted-p ((construct CharacteristicC)) @@ -2640,6 +2695,15 @@ (map 'list #'characteristic (slot-p parent-construct 'variants)))) +(defmethod mark-as-deleted ((construct NameC) &key source-locator revision) + "Marks the last active relation between a characteristic and its parent topic + as deleted." + (declare (ignorable source-locator)) + (dolist (variant (variants construct :revision revision)) + (private-delete-variant construct variant :revision revision)) + (call-next-method)) + + (defgeneric NameC-p (class-symbol) (:documentation "Returns t if the passed symbol is equal to Name.") (:method ((class-symbol symbol))

1 0

[isidorus-cvs] r642 - trunk/src/model
by lgiessmann＠common-lisp.net 18 Jul '11

18 Jul '11

Author: lgiessmann Date: Mon Jul 18 13:30:16 2011 New Revision: 642 Log: trunk: fixed a bug when deleten association scope-topics Modified: trunk/src/model/datamodel.lisp Modified: trunk/src/model/datamodel.lisp ============================================================================== --- trunk/src/model/datamodel.lisp Mon Jul 18 13:24:52 2011 (r641) +++ trunk/src/model/datamodel.lisp Mon Jul 18 13:30:16 2011 (r642) @@ -2768,6 +2768,8 @@ (let ((type-top (instance-of ass :revision revision))) (when type-top (private-delete-type ass type-top :revision revision))) + (dolist (theme (themes ass :revision revision)) + (private-delete-theme ass theme :revision revision)) (call-next-method))

1 0

[isidorus-cvs] r641 - in trunk/src: json/isidorus-json model
by lgiessmann＠common-lisp.net 18 Jul '11

18 Jul '11

Author: lgiessmann Date: Mon Jul 18 13:24:52 2011 New Revision: 641 Log: trunk: fixed a bung in the UI and the json exporter, now the backend marks all data, i.e. type, item-identifiers, reifier, roles (players, item-identifiers, reifier, type) and scopes of an association as deleted + the json exporter does not export mark-as-deleted associations of a fragment object Modified: trunk/src/json/isidorus-json/json_exporter.lisp trunk/src/model/datamodel.lisp Modified: trunk/src/json/isidorus-json/json_exporter.lisp ============================================================================== --- trunk/src/json/isidorus-json/json_exporter.lisp Mon Jul 18 08:36:53 2011 (r640) +++ trunk/src/json/isidorus-json/json_exporter.lisp Mon Jul 18 13:24:52 2011 (r641) @@ -353,18 +353,24 @@ (concat (subseq j-topicStubs 0 (- (length j-topicStubs) 1)) "]")) "null"))) (associations - (concat "\"associations\":" - (if (associations instance) - (let ((j-associations "[")) - (loop for item in (associations instance) - do (push-string - (concat (export-construct-as-isidorus-json-string - item :xtm-id xtm-id - :revision revision) ",") - j-associations)) - (concat (subseq j-associations 0 - (- (length j-associations) 1)) "]")) - "null"))) + (let ((filtered-assocs + (remove-null + (map 'list #'(lambda(assoc) + (when (find-item-by-revision assoc revision) + assoc)) + (associations instance))))) + (concat "\"associations\":" + (if filtered-assocs + (let ((j-associations "[")) + (loop for item in filtered-assocs + do (push-string + (concat (export-construct-as-isidorus-json-string + item :xtm-id xtm-id + :revision revision) ",") + j-associations)) + (concat (subseq j-associations 0 + (- (length j-associations) 1)) "]")) + "null")))) (tm-ids (concat "\"tmIds\":" (let ((uris Modified: trunk/src/model/datamodel.lisp ============================================================================== --- trunk/src/model/datamodel.lisp Mon Jul 18 08:36:53 2011 (r640) +++ trunk/src/model/datamodel.lisp Mon Jul 18 13:24:52 2011 (r641) @@ -2765,6 +2765,9 @@ (mapc (lambda (role) (mark-as-deleted role :revision revision :source-locator source-locator)) (roles ass :revision revision)) + (let ((type-top (instance-of ass :revision revision))) + (when type-top + (private-delete-type ass type-top :revision revision))) (call-next-method))

1 0

[isidorus-cvs] r640 - in trunk/src: model rest_interface
by lgiessmann＠common-lisp.net 18 Jul '11

18 Jul '11

Author: lgiessmann Date: Mon Jul 18 08:36:53 2011 New Revision: 640 Log: trunk: fixed the behavior of deleteng (mark-as-deleted) associations => all role players and types are also makred-as-deleted Modified: trunk/src/model/datamodel.lisp trunk/src/rest_interface/set-up-json-interface.lisp Modified: trunk/src/model/datamodel.lisp ============================================================================== --- trunk/src/model/datamodel.lisp Mon Jul 18 07:08:08 2011 (r639) +++ trunk/src/model/datamodel.lisp Mon Jul 18 08:36:53 2011 (r640) @@ -2764,7 +2764,7 @@ "Marks an association and its roles as deleted" (mapc (lambda (role) (mark-as-deleted role :revision revision :source-locator source-locator)) - (roles ass :revision 0)) + (roles ass :revision revision)) (call-next-method)) @@ -2877,16 +2877,18 @@ (defgeneric private-delete-role (construct role &key revision) - (:documentation "Deletes the passed role by marking it's association as + (:documentation "Deletes the passed role by marking it's association, + item-identifiers, reifier, player and type as deleted in the passed revision.") (:method ((construct AssociationC) (role RoleC) &key (revision (error (make-missing-argument-condition "From private-delete-role(): revision must be set" 'revision 'private-delete-role)))) - (let ((assoc-to-delete (loop for role-assoc in (slot-p construct 'roles) - when (eql (role role-assoc) role) - return role-assoc))) - (when assoc-to-delete - (mark-as-deleted assoc-to-delete :revision revision) - construct)))) + (let ((assoc-assoc-to-delete + (loop for role-assoc in (slot-p construct 'roles) + when (eql (role role-assoc) role) + return role-assoc))) + (when assoc-assoc-to-delete + (mark-as-deleted assoc-assoc-to-delete :revision revision)) + construct))) (defgeneric delete-role (construct role &key revision) @@ -2908,11 +2910,15 @@ "Marks the last active relation between a role and its parent association as deleted." (declare (ignorable source-locator)) - (let ((owner (parent construct :revision 0))) - (when owner - ;(private-delete-player construct (player construct :revision revision) - ;:revision revision) - (private-delete-role owner construct :revision revision)))) + (let ((player-top (player construct :revision revision)) + (type-top (instance-of construct :revision revision)) + (assoc (parent construct :revision revision))) + (when player-top + (private-delete-player construct player-top :revision revision)) + (when type-top + (private-delete-type construct type-top :revision revision)) + (when assoc + (private-delete-role assoc construct :revision revision)))) (defmethod marked-as-deleted-p ((construct RoleC)) @@ -3174,7 +3180,10 @@ "Marks all item-identifiers of a given reifiable-construct as deleted." (declare (ignorable source-locator)) (call-next-method) - (dolist (ii (item-identifiers construct :revision 0)) + (let ((reifier-top (reifier construct :revision revision))) + (when reifier-top + (private-delete-reifier construct reifier-top :revision revision))) + (dolist (ii (item-identifiers construct :revision revision)) (private-delete-item-identifier construct ii :revision revision))) Modified: trunk/src/rest_interface/set-up-json-interface.lisp ============================================================================== --- trunk/src/rest_interface/set-up-json-interface.lisp Mon Jul 18 07:08:08 2011 (r639) +++ trunk/src/rest_interface/set-up-json-interface.lisp Mon Jul 18 08:36:53 2011 (r640) @@ -426,7 +426,7 @@ (declare (ignorable param)) ;param is currently not used (let ((http-method (hunchentoot:request-method*))) (if (or (eq http-method :DELETE) - (eq http-method :Post)) ;not nice - but the current ui-library can't send http-delete messages + (eq http-method :POST)) ;not nice - but the current ui-library can't send http-delete messages (let ((external-format (flexi-streams:make-external-format :UTF-8 :eol-style :LF))) (let ((json-data (hunchentoot:raw-post-data :external-format external-format :force-text t))) (handler-case

1 0

[isidorus-cvs] r639 - trunk/src/ajax/javascripts
by lgiessmann＠common-lisp.net 18 Jul '11

18 Jul '11

Author: lgiessmann Date: Mon Jul 18 07:08:08 2011 New Revision: 639 Log: fixed ticket #114 => added a delete button and functionality for associations to the UI Modified: trunk/src/ajax/javascripts/constants.js trunk/src/ajax/javascripts/datamodel.js Modified: trunk/src/ajax/javascripts/constants.js ============================================================================== --- trunk/src/ajax/javascripts/constants.js Mon Jul 18 05:08:51 2011 (r638) +++ trunk/src/ajax/javascripts/constants.js Mon Jul 18 07:08:08 2011 (r639) @@ -24,7 +24,7 @@ var SUMMARY_URL = HOST_PREF + "json/summary"; var MARK_AS_DELETED_URL = HOST_PREF + "mark-as-deleted"; var TM_OVERVIEW = HOST_PREF + "json/tmcl/overview/"; -var TIMEOUT = 30000; // const TIMEOUT = 10000 --> "const" doesn't work under IE +var TIMEOUT = 60000; // const TIMEOUT = 10000 --> "const" doesn't work under IE @@ -94,6 +94,7 @@ "topicPsis" : function(){ return "topicPsis"; }, "removeLink" : function(){ return "removeLink"; }, "removeNameRow" : function(){ return "removeOccurrenceRow"; }, + "removeAssociationRow" : function(){ return "removeAssociationRow"; }, "removeOccurrenceRow" : function(){ return "removeNameRow"; }, "removeTopicRow" : function(){ return "removeTopicRow"; } }; Modified: trunk/src/ajax/javascripts/datamodel.js ============================================================================== --- trunk/src/ajax/javascripts/datamodel.js Mon Jul 18 05:08:51 2011 (r638) +++ trunk/src/ajax/javascripts/datamodel.js Mon Jul 18 07:08:08 2011 (r639) @@ -433,6 +433,18 @@ for(var i = 0; i !== values.length; ++i)values[i] = encodeURI(values[i]); return values; }, + "reset" : function(){ + if(!this.__container__.__frames__) return; + + for(var i = 0; i != this.__container__.__frames__.length; ++i) + this.__container__.__frames__[i].remove(); + + while(this.__container__.__frames__.length != 0)this.__container__.__frames__.shift(); + + new TextrowC("", ".*", this.__container__, 1, -1, null); + this.__error__.insert({"before" : this.__container__.__frames__[0].getFrame()}); + + }, "toJSON" : function(unique, removeNull){ var content = this.getContent(unique, removeNull); return content.length === 0 ? "null" : content.toJSON(); @@ -3678,6 +3690,13 @@ }); } setDblClickHandler(this); + + // --- mark-as-deleted + if(contents){ + var myself = this; + this.__table__.insert({"bottom" : makeRemoveLink(function(event){ + makeRemoveObject("Association", myself); + }, "delete Association")});} } catch(err){ alert("From AssociationC(): " + err); @@ -4359,6 +4378,7 @@ case "delete Occurrence" : trClass = CLASSES.removeOccurrenceRow(); break; case "delete Topic" : trClass = CLASSES.removeTopicRow(); break; case "delete Name" : trClass = CLASSES.removeNameRow(); break; + case "delete Association" : trClass = CLASSES.removeAssociationRow(); break; } var tr = new Element("tr", {"class" : trClass}).insert(new Element("td", {"colspan" : 3}).insert(link)); @@ -4372,7 +4392,7 @@ if(type !== "Occurrence" && type !== "Name" && type !== "Variant" && type !== "Topic" && type !== "Association"){ throw "From makeRemoveObject(): type must be: \"Occurrence\" || \"Name\" " + - "|| \"Topic\" but is " + type; + "|| \"Topic\" || \"Association\" but is " + type; } if (!objectToDelete){ throw "From makeRemoveObject(): objectToDelete must be set"; @@ -4418,15 +4438,18 @@ var delMessage = "null"; switch(type){ - case "Topic": + case "Topic": delMessage = "{\"type\":\"Topic\",\"delete\":" + makeJsonTopicStub(objectToDelete.getFrame()) + "}"; break; - case "Name": - case "Occurrence": + case "Name": + case "Occurrence": delMessage = "{\"type\":\"" + type + "\",\"parent\":" + - makeJsonTopicStub(objectToDelete.getFrame().parentNode.parentNode.parentNode.parentNode) + - ",\"delete\":" + objectToDelete.toJSON() + "}"; + makeJsonTopicStub(objectToDelete.getFrame().parentNode.parentNode.parentNode.parentNode) + + ",\"delete\":" + objectToDelete.toJSON() + "}"; break; + case "Association": + delMessage = "{\"type\":\"Association\",\"delete\":" + objectToDelete.toJSON() + "}"; + break; } commitDeletedObject(delMessage, function(xhr){ @@ -4434,8 +4457,14 @@ $(CLASSES.subPage()).update(); setNaviClasses($(PAGES.home)); makePage(PAGES.home, ""); - } - else if (type === "Occurrence" || type === "Name"){ + }else if(type === "Association"){ + if(objectToDelete.__owner__.__frames__.length === 1){ + objectToDelete.__itemIdentity__.reset(); + objectToDelete.disable(); + }else { + objectToDelete.remove(); + } + }else if (type === "Occurrence" || type === "Name"){ if(objectToDelete.__owner__.__frames__.length >= 1 && objectToDelete.__owner__.__frames__.length > objectToDelete.__min__){ objectToDelete.remove(); @@ -4458,6 +4487,6 @@ ii.remove(); } } - alert("Objected deleted"); + alert("Object deleted"); }); } \ No newline at end of file

1 0

[isidorus-cvs] r638 - trunk/src/shell_scripts
by lgiessmann＠common-lisp.net 18 Jul '11

18 Jul '11

Author: lgiessmann Date: Mon Jul 18 05:08:51 2011 New Revision: 638 Log: trunk fixed ticket #116 => the admin interface accpets requests that initiate a backup as xtm file Added: trunk/src/shell_scripts/backup-isidorus.sh (contents, props changed) Modified: trunk/src/shell_scripts/shutdown-isidorus.sh Added: trunk/src/shell_scripts/backup-isidorus.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/shell_scripts/backup-isidorus.sh Mon Jul 18 05:08:51 2011 (r638) @@ -0,0 +1,105 @@ +#!/bin/bash +##+----------------------------------------------------------------------------- +##+ 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. +##+----------------------------------------------------------------------------- + + +## This script can be used to invoke hunchentoot's admin interface and backup +## the server date. The default ip address is set to 127.0.0.1 and can be changed via +## the switch -host <ip-address>. The default url that determines the server's +## callback binding is set to /admin/backup, but this behavior can also be +## changed by using the switch -url <url-fragment>. The path variable +## contains the name of the stored xtm backup file that is created, the default +## value is a date string of the form dd.mm.yyyy:hh:mm:ss.xtm" and can be +## changed by using the switch -path <any-string>. +## A sample call would be +## ./backup-isidorus.sh -host 12.34.56.78 -url /admin/shutdown -path=backup.xtm + +url="/admin/backup"; +host="127.0.0.1:11008"; +path=`date +"%d.%m.%y:%H:%M:%S"`".xtm" + +if [ $# -eq 0 ]; then + : +elif [ $# -eq 1 -a $1 = "?" ]; then + echo "you can pass the arguments -host <host-url>, -url </url-fragment> and -path <any-string>, if no arguments are passed the default values 127.0.0.1:11008, /admin/backup and <current-data>.xtm are used"; + exit; +elif [ $# -eq 2 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + elif [ $1 = "-path" ]; then + path=$2; + else + echo "only the arguments -host, -url and -path are supported, use ? for more information"; + exit; + fi +elif [ $# -eq 4 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + elif [ $1 = "-path" ]; then + path=$2; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi + + if [ $3 = "-host" ]; then + host=$4; + elif [ $3 = "-url" ]; then + url=$4; + elif [ $3 = "-path" ]; then + path=$4; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi +elif [ $# -eq 6 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + elif [ $1 = "-path" ]; then + path=$2; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi + + if [ $3 = "-host" ]; then + host=$4; + elif [ $3 = "-url" ]; then + url=$4; + elif [ $3 = "-path" ]; then + path=$4; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi + if [ $5 = "-host" ]; then + host=$6; + elif [ $5 = "-url" ]; then + url=$6; + elif [ $5 = "-path" ]; then + path=$6; + else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; + fi +else + echo "only the arguments -host, -url and path are supported, use ? for more information"; + exit; +fi + + + + +curl $host$url"?path="$path; \ No newline at end of file Modified: trunk/src/shell_scripts/shutdown-isidorus.sh ============================================================================== --- trunk/src/shell_scripts/shutdown-isidorus.sh Mon Jul 18 04:07:59 2011 (r637) +++ trunk/src/shell_scripts/shutdown-isidorus.sh Mon Jul 18 05:08:51 2011 (r638) @@ -22,7 +22,7 @@ if [ $# -eq 0 ]; then : elif [ $# -eq 1 -a $1 = "?" ]; then - echo "you can pass the arguments -host <host-url> and -url </url-fragment>, if no arguments are passed the default values 127.0.0.1 and 11008 are used"; + echo "you can pass the arguments -host <host-url> and -url </url-fragment>, if no arguments are passed the default values 127.0.0.1:11008 and /admin/shutdown are used"; exit; elif [ $# -eq 2 ]; then if [ $1 = "-host" ]; then

1 0

[isidorus-cvs] r637 - in trunk/src: . rest_interface shell_scripts
by lgiessmann＠common-lisp.net 18 Jul '11

18 Jul '11

Author: lgiessmann Date: Mon Jul 18 04:07:59 2011 New Revision: 637 Log: fixed ticket #113 => hunchentoot defines a new admin interface that allows to sut down the server from a predefined ip address; each time a shut down is initiated a backup file in the working directory and the name of the form backup_dd.mm.yyyy:hh:mm:ss is created. Added: trunk/src/rest_interface/admin-interface.lisp trunk/src/shell_scripts/ trunk/src/shell_scripts/shutdown-isidorus.sh (contents, props changed) Modified: trunk/src/isidorus.asd trunk/src/rest_interface/rest-interface.lisp Modified: trunk/src/isidorus.asd ============================================================================== --- trunk/src/isidorus.asd Sun Jul 17 13:50:32 2011 (r636) +++ trunk/src/isidorus.asd Mon Jul 18 04:07:59 2011 (r637) @@ -111,6 +111,8 @@ :depends-on ("rest-interface")) (:file "set-up-json-interface" :depends-on ("rest-interface")) + (:file "admin-interface" + :depends-on ("rest-interface")) (:file "read" :depends-on ("rest-interface"))) :depends-on ("model" "atom" "xml" "TM-SPARQL" Added: trunk/src/rest_interface/admin-interface.lisp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/rest_interface/admin-interface.lisp Mon Jul 18 04:07:59 2011 (r637) @@ -0,0 +1,77 @@ +;;+----------------------------------------------------------------------------- +;;+ 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. +;;+----------------------------------------------------------------------------- + +(in-package :rest-interface) + +;;TODO: add functions to export statement + +;the prefix to get a fragment by the psi -> localhost:8000/json/get/<fragment-psi> +(defparameter *admin-backup* "/admin/backup") +;the prefix to get a fragment by the psi -> localhost:8000/json/rdf/get/<fragment-psi> +(defparameter *admin-shutdown* "/admin/shutdown") + + +(defun set-up-admin-interface () + (push + (create-regex-dispatcher *admin-backup* #'admin-backup) + hunchentoot:*dispatch-table*) + (push + (create-regex-dispatcher *admin-shutdown* #'admin-shutdown) + hunchentoot:*dispatch-table*)) + + + +(defun admin-shutdown() + (handler-case + (if (string= *admin-remote-name* (hunchentoot:remote-addr*)) + (progn + (when elephant:*store-controller* + (xtm-exporter:export-as-xtm + (concat "backup_" (make-date-string (get-universal-time)) ".xtm") + :tm-id "http://isidor.us/backup-tm" + :revision 0)) + (shutdown-json-engine) + (shutdown-atom-engine) + (shutdown-admin-server) + (close-tm-store)) ;in case the json and atom services are not running + (setf (hunchentoot:return-code*) hunchentoot:+http-forbidden+)) + (condition (err) + (progn + (tools:close-tm-store) + (setf (hunchentoot:return-code*) hunchentoot:+http-internal-server-error+) + (setf (hunchentoot:content-type*) "text") + (format nil "closed the tm store, but:~%condition: \"~a\"" err))))) + + + + +(defun admin-backup() + (handler-case + (if (string= "127.0.0.1" (hunchentoot:remote-addr*)) + (let ((destination-path + (hunchentoot:url-decode (hunchentoot:get-parameter "path")))) + (xtm-exporter:export-as-xtm destination-path + :tm-id "http://isidor.us/backup-tm" + :revision 0)) + (setf (hunchentoot:return-code*) hunchentoot:+http-forbidden+)) + (condition (err) + (progn + (setf (hunchentoot:return-code*) hunchentoot:+http-internal-server-error+) + (setf (hunchentoot:content-type*) "text") + (format nil "Condition: \"~a\"" err))))) + + +(defun make-date-string (universal-time) + (tools:concat + (write-to-string (nth-value 3 (decode-universal-time universal-time))) "." + (write-to-string (nth-value 4 (decode-universal-time universal-time))) "." + (write-to-string (nth-value 5 (decode-universal-time universal-time))) ":" + (write-to-string (nth-value 2 (decode-universal-time universal-time))) ":" + (write-to-string (nth-value 1 (decode-universal-time universal-time))) ":" + (write-to-string (nth-value 0 (decode-universal-time universal-time))))) \ No newline at end of file Modified: trunk/src/rest_interface/rest-interface.lisp ============================================================================== --- trunk/src/rest_interface/rest-interface.lisp Sun Jul 17 13:50:32 2011 (r636) +++ trunk/src/rest_interface/rest-interface.lisp Mon Jul 18 04:07:59 2011 (r637) @@ -30,8 +30,13 @@ :read-fragment-feed :start-json-engine :start-atom-engine + :start-admin-server :shutdown-json-engine :shutdown-atom-engine + :shutdown-admin-server + :*admin-host-name* + :*admin-port* + :*admin-remote-name* :*json-get-prefix* :*get-rdf-prefix* :*json-commit-url* @@ -69,6 +74,31 @@ (defvar *json-server-acceptor* nil) (defvar *atom-server-acceptor* nil) +(defvar *admin-server-acceptor* nil) +(defvar *admin-host-name* "127.0.0.1") +(defvar *admin-port* 11008) +(defvar *admin-remote-name* "127.0.0.1") + + +(defun start-admin-server () + (when *admin-server-acceptor* + (error "The admin-server is already running")) + (set-up-admin-interface ) + (setf hunchentoot:*show-lisp-errors-p* t) + (setf hunchentoot:*hunchentoot-default-external-format* + (flex:make-external-format :utf-8 :eol-style :lf)) + (setf *admin-server-acceptor* + (make-instance 'hunchentoot:acceptor + :address *admin-host-name* + :port *admin-port*)) + (hunchentoot:start *admin-server-acceptor*)) + + +(defun shutdown-admin-server () + "Shut down the admin server." + (when *admin-server-acceptor* + (hunchentoot:stop *admin-server-acceptor*)) + (setf *admin-server-acceptor* nil)) (defun start-json-engine (repository-path &key @@ -93,7 +123,8 @@ (defun shutdown-json-engine () "Shut down the Topic Map Engine, only the json part." - (hunchentoot:stop *json-server-acceptor*) + (when *json-server-acceptor* + (hunchentoot:stop *json-server-acceptor*)) (setf *json-server-acceptor* nil) (close-tm-store)) @@ -122,6 +153,7 @@ (defun shutdown-atom-engine () "Shut down the Topic Map Engine, only the atom part." - (hunchentoot:stop *atom-server-acceptor*) + (when *atom-server-acceptor* + (hunchentoot:stop *atom-server-acceptor*)) (setf *atom-server-acceptor* nil) (close-tm-store)) \ No newline at end of file Added: trunk/src/shell_scripts/shutdown-isidorus.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/shell_scripts/shutdown-isidorus.sh Mon Jul 18 04:07:59 2011 (r637) @@ -0,0 +1,62 @@ +#!/bin/bash +##+----------------------------------------------------------------------------- +##+ 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. +##+----------------------------------------------------------------------------- + + +## This script can be used to invoke hunchentoot's admin interface and shut down +## the server. The default ip address is set to 127.0.0.1 and can be changed via +## the switch -host <ip-address>. The default url that determines the server's +## callback binding is set to /admin/shutdown, but this behavior can also be +## changed by using the switch -url <url-fragment>. +## a sample call would be ./shutdown-isidorus.sh -host 12.34.56.78 -url /admin/shutdown + +url="/admin/shutdown"; +host="127.0.0.1:11008"; + +if [ $# -eq 0 ]; then + : +elif [ $# -eq 1 -a $1 = "?" ]; then + echo "you can pass the arguments -host <host-url> and -url </url-fragment>, if no arguments are passed the default values 127.0.0.1 and 11008 are used"; + exit; +elif [ $# -eq 2 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + else + echo "only the arguments -host and -url are supported, use ? for more information"; + exit; + fi +elif [ $# -eq 4 ]; then + if [ $1 = "-host" ]; then + host=$2; + elif [ $1 = "-url" ]; then + url=$2; + else + echo "only the arguments -host and -url are supported, use ? for more information"; + exit; + fi + + if [ $3 = "-host" ]; then + host=$4; + elif [ $3 = "-url" ]; then + url=$4; + else + echo "only the arguments -host and -url are supported, use ? for more information"; + exit; + fi +else + echo "only the arguments -host and -url are supported, use ? for more information"; + exit; +fi + +curl $host$url + + +

1 0