Author: dmeyer
Date: Mon Feb 4 14:00:12 2008
New Revision: 3030
Log:
fix item sync in parser
Modified:
trunk/beacon/src/db.py
trunk/beacon/src/server/db.py
trunk/beacon/src/server/parser.py
Modified: trunk/beacon/src/db.py
==============================================================================
--- trunk/beacon/src/db.py (original)
+++ trunk/beacon/src/db.py Mon Feb 4 14:00:12 2008
@@ -456,14 +456,6 @@
yield result
- def query_name_and_parent(self, name, parent):
- """
- Return item for name (string) and parent (type, id).
- FIXME: this function is only needed for the parser
- """
- return self._db.query(name=name, parent=parent)
-
-
def query_filename(self, filename):
"""
Return item for filename, can't be in overlay. This function will
Modified: trunk/beacon/src/server/db.py
==============================================================================
--- trunk/beacon/src/server/db.py (original)
+++ trunk/beacon/src/server/db.py Mon Feb 4 14:00:12 2008
@@ -178,6 +178,17 @@
self.signals['changed'].emit(changes)
+ def sync_item(self, item):
+ """
+ Sync item with current db information.
+ This function is only needed for the parser.
+ """
+ r = self._db.query(name=item._beacon_data['name'],
+ parent=item._beacon_parent._beacon_id)
+ if r:
+ item._beacon_database_update(r[0])
+
+
def add_object(self, type, metadata=None, **kwargs):
"""
Add an object to the db.
Modified: trunk/beacon/src/server/parser.py
==============================================================================
--- trunk/beacon/src/server/parser.py (original)
+++ trunk/beacon/src/server/parser.py Mon Feb 4 14:00:12 2008
@@ -105,10 +105,7 @@
if parent._beacon_id and not item._beacon_id:
# check if the item is in the db now from a different
# list of items.
- r = db.query_name_and_parent(name=item._beacon_data['name'],
- parent=parent._beacon_id)
- if r:
- item._beacon_database_update(r[0]._beacon_data)
+ r = db.sync_item(item)
if item._beacon_data.get('mtime') == mtime:
# The item already is in the database and the mtime is unchanged.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
