isidorus-cvs

Download

isidorus-cvs@common-lisp.net

January 2010

1 participants
2 discussions

[isidorus-cvs] r175 - in trunk/src/xml: rdf xtm
by Lukas Giessmann 19 Jan '10

19 Jan '10

Author: lgiessmann Date: Tue Jan 19 15:17:03 2010 New Revision: 175 Log: fixed an exporter-problem with older versions of sbcl -> the external-format is now set to utf-8 explicitely Modified: trunk/src/xml/rdf/exporter.lisp trunk/src/xml/xtm/exporter.lisp Modified: trunk/src/xml/rdf/exporter.lisp ============================================================================== --- trunk/src/xml/rdf/exporter.lisp (original) +++ trunk/src/xml/rdf/exporter.lisp Tue Jan 19 15:17:03 2010 @@ -119,6 +119,7 @@ (init-*ns-map*) (setf *export-tm* tm) (with-revision revision + (setf SB-IMPL::*DEFAULT-EXTERNAL-FORMAT* :utf-8) (with-open-file (stream rdf-path :direction :output) (cxml:with-xml-output (cxml:make-character-stream-sink stream :canonical nil) Modified: trunk/src/xml/xtm/exporter.lisp ============================================================================== --- trunk/src/xml/xtm/exporter.lisp (original) +++ trunk/src/xml/xtm/exporter.lisp Tue Jan 19 15:17:03 2010 @@ -75,6 +75,7 @@ (get-item-by-item-identifier tm-id :revision revision)))) (setf *export-tm* tm) (with-revision revision + (setf SB-IMPL::*DEFAULT-EXTERNAL-FORMAT* :utf-8) (with-open-file (stream xtm-path :direction :output) (cxml:with-xml-output (cxml:make-character-stream-sink stream :canonical nil) (if (eq xtm-format '2.0)

1 0

[isidorus-cvs] r174 - in trunk/src: model unit_tests
by Lukas Giessmann 18 Jan '10

18 Jan '10

Author: lgiessmann Date: Mon Jan 18 04:56:43 2010 New Revision: 174 Log: fixed a problem in the function \"get-most-recent-version-info\" -> ticket #62 Modified: trunk/src/model/datamodel.lisp trunk/src/unit_tests/versions_test.lisp Modified: trunk/src/model/datamodel.lisp ============================================================================== --- trunk/src/model/datamodel.lisp (original) +++ trunk/src/model/datamodel.lisp Mon Jan 18 04:56:43 2010 @@ -422,7 +422,14 @@ new-construct)))) (defmethod get-most-recent-version-info ((construct TopicMapConstructC)) - (find 0 (versions construct) :key #'end-revision)) + (let ((result (find 0 (versions construct) :key #'end-revision))) + (if result + result ;current version-info -> end-revision = 0 + (let ((sorted-list (sort (versions construct) + #'(lambda(x y) + (> (end-revision x) (end-revision y)))))) + (when sorted-list + (first sorted-list)))))) ;latest version-info of marked-as-deleted constructs -> highest integer (defgeneric equivalent-constructs (construct1 construct2) (:documentation "checks if two topic map constructs are equal according to the TMDM equality rules")) Modified: trunk/src/unit_tests/versions_test.lisp ============================================================================== --- trunk/src/unit_tests/versions_test.lisp (original) +++ trunk/src/unit_tests/versions_test.lisp Mon Jan 18 04:56:43 2010 @@ -360,7 +360,10 @@ (mark-as-deleted semantic-standard-topic :source-locator "http://blablub.egovpt.org/" :revision fixtures::revision3) (is-true (get-item-by-psi "http://psi.egovpt.org/types/semanticstandard" - :revision (1+ fixtures::revision3)))))) + :revision (1+ fixtures::revision3))) + (is (= 0 (d::end-revision (d::get-most-recent-version-info semantic-standard-topic)))) + (is (= (d::end-revision (first (last (d::versions norwegian-curriculum-topic)))) + (d::end-revision (d::get-most-recent-version-info norwegian-curriculum-topic)))))))

1 0