Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
b138d99d
Commit
b138d99d
authored
Dec 01, 2013
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(python): подправил коментарии к некоторым функциям и изменил название
на более "удачное". Добавил в UniXML параметр позволяющий загружать xml не только из файла, но и из "памяти"(строки).
parent
d7ea1f54
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
10 deletions
+18
-10
UGlobal.py
python/lib/UGlobal.py
+4
-4
UniXML.py
python/lib/UniXML.py
+14
-6
No files found.
python/lib/UGlobal.py
View file @
b138d99d
...
...
@@ -92,8 +92,8 @@ def to_sid(str_id, ui):
return
[
s_id
,
s_node
,
str
(
s_name
+
"@"
+
n_name
)]
# Получение списка пар [id
,val,node
] из строки "id1@node1=val1,id2=val2,.."
def
get_
list
(
raw_str
,
ui
,
sep
=
'='
):
# Получение списка пар [id
@node,int(val)
] из строки "id1@node1=val1,id2=val2,.."
def
get_
int_list
(
raw_str
,
sep
=
'='
):
if
raw_str
==
None
or
raw_str
==
""
:
return
[]
...
...
@@ -119,7 +119,7 @@ def list_to_str(lst,sep='='):
return
res
# Получение списка пар [s
1,2] для реализации шаблонов
# Получение списка пар [s
X,kX] из строки "s1=k1,s2=k2,.."
def
get_str_list
(
raw_str
,
sep
=
'='
):
if
raw_str
==
None
or
raw_str
==
""
:
...
...
@@ -136,7 +136,7 @@ def get_str_list(raw_str,sep='='):
slist
.
append
([
v
[
0
],
""
])
return
slist
# Получение списка пар [key,val] из строки "key1
=val1,key2=
val2,.."
# Получение списка пар [key,val] из строки "key1
:val1,key2:
val2,.."
def
get_replace_list
(
raw_str
):
if
raw_str
==
None
or
raw_str
==
""
:
...
...
python/lib/UniXML.py
View file @
b138d99d
...
...
@@ -34,11 +34,15 @@ class UniXMLException(Exception):
# -----------------------------
class
UniXML
():
def
__init__
(
self
,
xfile
):
def
__init__
(
self
,
xfile
,
isDoc
=
False
):
try
:
self
.
doc
=
None
self
.
fname
=
xfile
self
.
doc
=
libxml2
.
parseFile
(
xfile
)
if
isDoc
:
self
.
fname
=
''
self
.
doc
=
libxml2
.
parseDoc
(
xfile
)
else
:
self
.
fname
=
xfile
self
.
doc
=
libxml2
.
parseFile
(
xfile
)
except
libxml2
.
parserError
:
raise
UniXMLException
(
"(UniXML): Can`t open file "
+
xfile
)
...
...
@@ -147,11 +151,15 @@ class UniXML():
return
self
.
doc
.
saveFile
(
filename
)
def
reopen
(
self
,
filename
):
def
reopen
(
self
,
filename
,
isDoc
=
False
):
try
:
self
.
doc
.
freeDoc
()
self
.
fname
=
filename
self
.
doc
=
libxml2
.
parseFile
(
filename
)
if
isDoc
:
self
.
fname
=
''
self
.
doc
=
libxml2
.
parseDoc
(
filename
)
else
:
self
.
fname
=
filename
self
.
doc
=
libxml2
.
parseFile
(
filename
)
except
libxml2
.
parserError
:
sys
.
exit
(
-
1
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment