Skip to content

Commit 3388925

Browse files
committed
Fixed another Bug with OrientDB name
1 parent 1c630d0 commit 3388925

2 files changed

Lines changed: 37 additions & 11 deletions

File tree

pyorient/otypes.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,18 +217,16 @@ def _parse_version( self, string_release ):
217217
if "-" in self.minor:
218218
_temp = self.minor.split( "-" )
219219
self.minor = _temp[0]
220-
self.build = 0
220+
self.build = '0'
221221
self.subversion = _temp[1]
222222

223223
if "-" in self.build:
224-
_temp = self.build.split("-")
225-
self.build = _temp[0]
226-
self.subversion = _temp[1]
227-
else:
228224
import re
229-
preg = re.match( '([0-9]+)(.*)', self.build )
225+
preg = re.match( '([0-9])[\.\- ]*(.*)', self.build )
230226
self.build = preg.group(1)
231227
self.subversion = preg.group(2)
228+
else:
229+
self.build = self.build[0]
232230

233231
self.major = int( self.major )
234232
self.minor = int( self.minor )

test.py

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,34 @@
11
import pyorient
2-
db_name = "GratefulDeadConcerts"
3-
client = pyorient.OrientDB("localhost", 2424)
4-
client.set_session_token(True)
5-
cluster_info = client.db_open( db_name, "admin", "admin" )
6-
print(client.db_count_records())
2+
# db_name = "GratefulDeadConcerts"
3+
# client = pyorient.OrientDB("localhost", 2424)
4+
# client.set_session_token(True)
5+
# cluster_info = client.db_open( db_name, "admin", "admin" )
6+
# print(client.db_count_records())
7+
8+
release = "2.2.0 (build develop@r79d281140b01c0bc3b566a46a64f1573cb359783; 2016-05-18 14:14:32+0000)"
9+
x = pyorient.OrientVersion(release)
10+
print(x.major)
11+
print(x.minor)
12+
print(x.build)
13+
print(x.subversion)
14+
15+
release = "2.2.0-rc1"
16+
x = pyorient.OrientVersion(release)
17+
print(x.major)
18+
print(x.minor)
19+
print(x.build)
20+
print(x.subversion)
21+
22+
release = "2.2.0-rc1"
23+
x = pyorient.OrientVersion(release)
24+
print(x.major)
25+
print(x.minor)
26+
print(x.build)
27+
print(x.subversion)
28+
29+
release = "2.2.0 ;Unknown (build 0)"
30+
x = pyorient.OrientVersion(release)
31+
print(x.major)
32+
print(x.minor)
33+
print(x.build)
34+
print(x.subversion)

0 commit comments

Comments
 (0)