DataBaseSourceCodeManager.st
branchjv
changeset 3063 5334204e354f
parent 3042 48e76977cdc3
child 3121 19723298dd2c
child 3125 08d6603c4fe9
--- a/DataBaseSourceCodeManager.st	Tue Jul 24 16:47:21 2012 +0100
+++ b/DataBaseSourceCodeManager.st	Wed Jul 25 09:46:08 2012 +0100
@@ -444,54 +444,7 @@
     "return a VersionInfo object filled with revision info.
      This extracts the relevant info from aString."
 
-    |info path version user ts timeStamp idx1 idx2|
-
-    "/ 'Path: stx/libbasic/Array.st, Version: 123, User: cg, Time: 2011-12-21T21:03:08.826'
-
-    idx1 := aString indexOfSubCollection:'Path: '.
-    idx1 ~~ 0 ifTrue:[
-        idx1 := idx1 + 'Path: ' size.
-        idx2 := aString indexOfSubCollection:', ' startingAt:idx1.
-        path := aString copyFrom:idx1 to:idx2-1.     
-    ].
-    idx1 := aString indexOfSubCollection:'Version: '.
-    idx1 ~~ 0 ifTrue:[
-        idx1 := idx1 + 'Version: ' size.
-        idx2 := aString indexOfSubCollection:', ' startingAt:idx1.
-        idx2 == 0 ifTrue:[
-            version := aString copyFrom:idx1     
-        ] ifFalse:[
-            version := aString copyFrom:idx1 to:idx2-1.     
-        ].
-    ].
-    idx1 := aString indexOfSubCollection:'User: '.
-    idx1 ~~ 0 ifTrue:[
-        idx1 := idx1 + 'User: ' size.
-        idx2 := aString indexOfSubCollection:', ' startingAt:idx1.
-        idx2 == 0 ifTrue:[
-            user := aString copyFrom:idx1     
-        ] ifFalse:[
-            user := aString copyFrom:idx1 to:idx2-1.     
-        ].
-    ].
-    idx1 := aString indexOfSubCollection:'Time: '.
-    idx1 ~~ 0 ifTrue:[
-        idx1 := idx1 + 'Time: ' size.
-        idx2 := aString indexOfSubCollection:', ' startingAt:idx1.
-        idx2 == 0 ifTrue:[
-            ts := aString copyFrom:idx1     
-        ] ifFalse:[
-            ts := aString copyFrom:idx1 to:idx2-1.     
-        ].
-        timeStamp := Timestamp readIso8601FormatFrom:ts
-    ].
-
-    info := VersionInfo new.
-    path notNil ifTrue:[ info fileName:(path asFilename baseName) ].
-    info revision:version.
-    user notNil ifTrue:[ info user:user ].
-    timeStamp notNil ifTrue:[ info timeStamp:timeStamp ].
-    ^ info
+    ^ self revisionInfoFromStandardVersionString:aString
 
     "
      self revisionInfoFromString:'Path: stx/libbasic/Array.st, Version: 123, User: cg, Time: 2011-12-21T21:03:08.826' 
@@ -566,18 +519,17 @@
 !
 
 revisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName revision:revisionString
-    "return a string usable as initial revision string"
+    "utility function: return a string usable as initial revision string"
 
-    ^ 'Path: %1/%2/%3, Version: %4, User: %5, Time: %6'
-        bindWith:moduleDir
-        with:packageDir
-        with:fileName
-        with:revisionString
-        with:(OperatingSystem getLoginName)
-        with:(Timestamp now printStringIso8601Format)
+    ^ self standardRevisionStringFor:aClass inModule:moduleDir directory:packageDir container:fileName revision:revisionString
 
     "
-     self revisionStringFor:Array inModule:'stx' directory:'libbasic' container:'Array.st' revision:'123'
+     self 
+        revisionStringFor:Array 
+        inModule:'stx' 
+        directory:'libbasic' 
+        container:'Array.st' 
+        revision:'123'          
     "
 
     "Created: / 21-12-2011 / 19:33:33 / cg"
@@ -597,13 +549,13 @@
 !DataBaseSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Id: DataBaseSourceCodeManager.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/DataBaseSourceCodeManager.st,v 1.10 2012/07/24 07:44:39 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic3/DataBaseSourceCodeManager.st,v 1.9 2012/01/19 15:19:52 cg Exp §'
+    ^ '§Header: /cvs/stx/stx/libbasic3/DataBaseSourceCodeManager.st,v 1.10 2012/07/24 07:44:39 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: DataBaseSourceCodeManager.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Id: DataBaseSourceCodeManager.st 1937 2012-07-25 08:46:08Z vranyj1 $'
 ! !