Permalink
Browse files

Merge branch 'master' of git.sv.gnu.org:/srv/git/gnowsys

  • Loading branch information...
gnowgi committed Aug 20, 2012
2 parents fd9cc8d + 1172262 commit 02b3d1e20002f4388734e62b6d1afbff5b383ba3
@@ -13,59 +13,59 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from django.core.management.base import BaseCommand
-from optparse import make_option
-
-import re
-from datetime import datetime
-from objectapp.models import Gbobject
-from xmlrpclib import DateTime
-from xmlrpclib import ServerProxy
-
-class Command(BaseCommand):
- """Gets all Gbobjects for a specified server"""
- option_list = BaseCommand.option_list + (
- make_option("--server", action="store", type="string",
- dest="server", help="Specify an ip"),)
-
- def handle(self, *args, **options):
- def parse_id(id=None):
- def inner_parse(id):
- """Gets a dict, parses and saves it"""
- dict = srv.metaWeblog.dict_id(id)
- pattern = "^(\d{4})(\d{2})(\d{2}).(\d{2}).(\d{2}).(\d{2})$"
-
- cd = DateTime().make_comparable(dict['creation_date'])[1]
- lu = DateTime().make_comparable(dict['last_update'])[1]
- ep = DateTime().make_comparable(dict['end_publication'])[1]
- sp = DateTime().make_comparable(dict['start_publication'])[1]
-
- def group(value):
- return value.group(1, 2, 3, 4, 5, 6)
-
- cd = group(re.search(pattern, cd))
- lu = group(re.search(pattern, lu))
- ep = group(re.search(pattern, ep))
- sp = group(re.search(pattern, sp))
-
- def str_to_int(string):
- return [int(x) for x in string]
-
- cd = str_to_int(cd)
- lu = str_to_int(lu)
- ep = str_to_int(ep)
- sp = str_to_int(sp)
-
- dict['creation_date'] = datetime(*cd)
- dict['last_update'] = datetime(*lu)
- dict['end_publication'] = datetime(*ep)
- dict['start_publication'] = datetime(*sp)
-
- Gbobject(**dict).save()
-
- for d in srv.metaWeblog.dict_id():
- inner_parse(d['node_ptr_id'])
-
- server = options["server"]
- srv = ServerProxy(server, allow_none=True)
- parse_id()
+# from django.core.management.base import BaseCommand
+# from optparse import make_option
+
+# import re
+# from datetime import datetime
+# from objectapp.models import Gbobject
+# from xmlrpclib import DateTime
+# from xmlrpclib import ServerProxy
+
+# class Command(BaseCommand):
+# """Gets all Gbobjects for a specified server"""
+# option_list = BaseCommand.option_list + (
+# make_option("--server", action="store", type="string",
+# dest="server", help="Specify an ip"),)
+
+# def handle(self, *args, **options):
+# def parse_id(id=None):
+# def inner_parse(id):
+# """Gets a dict, parses and saves it"""
+# dict = srv.metaWeblog.dict_id(id)
+# pattern = "^(\d{4})(\d{2})(\d{2}).(\d{2}).(\d{2}).(\d{2})$"
+
+# cd = DateTime().make_comparable(dict['creation_date'])[1]
+# lu = DateTime().make_comparable(dict['last_update'])[1]
+# ep = DateTime().make_comparable(dict['end_publication'])[1]
+# sp = DateTime().make_comparable(dict['start_publication'])[1]
+
+# def group(value):
+# return value.group(1, 2, 3, 4, 5, 6)
+
+# cd = group(re.search(pattern, cd))
+# lu = group(re.search(pattern, lu))
+# ep = group(re.search(pattern, ep))
+# sp = group(re.search(pattern, sp))
+
+# def str_to_int(string):
+# return [int(x) for x in string]
+
+# cd = str_to_int(cd)
+# lu = str_to_int(lu)
+# ep = str_to_int(ep)
+# sp = str_to_int(sp)
+
+# dict['creation_date'] = datetime(*cd)
+# dict['last_update'] = datetime(*lu)
+# dict['end_publication'] = datetime(*ep)
+# dict['start_publication'] = datetime(*sp)
+
+# Gbobject(**dict).save()
+
+# for d in srv.metaWeblog.dict_id():
+# inner_parse(d['node_ptr_id'])
+
+# server = options["server"]
+# srv = ServerProxy(server, allow_none=True)
+# parse_id()
@@ -20,10 +20,6 @@
import sys
from datetime import datetime
-from objectapp.models import Gbobject
-from objectapp.models import Objecttype
-from objectapp.models import Attributetype
-from objectapp.models import Relationtype
from objectapp.models import ObjectDoesNotExist
# from gstudio.xmlrpc.metaweblog import class_checker
@@ -40,7 +36,9 @@ class Command(BaseCommand):
"""Gets all Gbobjects from a specified server"""
option_list = BaseCommand.option_list + (
make_option("--server", action="store", type="string",
- dest="server", help="Specify an ip"),)
+ dest="server", help="Specify IP address or URI"),
+ make_option("--instance", action="store", type="string",
+ dest="instance", help="Specify an instance"),)
def handle(self, *args, **options):
def class_checker(m):
@@ -83,8 +81,9 @@ def group(value):
def str_to_int(string):
return [int(x) for x in string]
+ # Weird check for DateTime objects
+
for key in i.keys():
- # Weird check for DateTime objects
if "make_comparable" in dir(i[key]):
dt = DateTime().make_comparable(i[key])[1]
dt = str_to_int(group(re.search(pattern, dt)))
@@ -94,19 +93,31 @@ def str_to_int(string):
class_checker(module)[instance](**i).save()
except (ObjectDoesNotExist, IntegrityError):
- sys.stderr.write("Object matching query does not exist\n")
+ sys.stderr.write("sync-instances.py:55: "
+ "Object matching query does not exist\n")
except ValueError:
- sys.stderr.write("Object already exists\n")
+ sys.stderr.write("sync-instances.py:93: "
+ "Object already exists\n")
server = options["server"]
srv = ServerProxy(server, allow_none=True)
+ instance = options["instance"]
+
objcc = class_checker(objmodels)
gstcc = class_checker(gstmodels)
- for i in objcc.keys():
- parse("objectapp.models", i)
+ if instance:
+ if instance in objkeys:
+ parse("objectapp.models", instance)
+
+ if instance in gstkeys:
+ parse("gstudio.models", instance)
+
+ else:
+ for i in objkeys:
+ parse("objectapp.models", i)
- for i in gstcc.keys():
- parse("gstudio.models", i)
+ for i in gstkeys:
+ parse("gstudio.models", i)
Oops, something went wrong.

0 comments on commit 02b3d1e

Please sign in to comment.