Changeset 162:ca1529c62df9 for classifier/storage.py

Timestamp:

08/21/07 19:12:16 (11 months ago)

Author:

Tarek Ziad?? <tarek@…>

Message:

fixes

Files:

• classifier/storage.py (modified) (11 diffs)

classifier/storage.py

@@ -25 +25 @@
 lang = Table('classifier_lang', _metadata,
              Column('iso', String(3), primary_key=True),
-             Column('user', String(40)))
+             Column('user', String(40), primary_key=True))
 
 word = Table('classifier_word', _metadata,
@@ -31 +31 @@
             Column('lang_iso', String(3), ForeignKey('classifier_lang.iso')),
             Column('count', Integer),
-            Column('user', String(40))
+            Column('user', String(40), primary_key=True)
             )
 
@@ -37 +37 @@
                  Column('name', String(50), primary_key=True),
                  Column('description', String(300)),
-                 Column('user', String(40)))
+                 Column('user', String(40), primary_key=True))
 
 
 word_category = Table('classifier_word_category', _metadata,
-                 Column('id', Integer, primary_key=True),
+                 #Column('id', Integer, primary_key=True),
                  Column('word_value', String(200),
-                        ForeignKey('classifier_word.value')),
+                        ForeignKey('classifier_word.value'), primary_key=True),
                  Column('count', Integer),
                  Column('category_name', String(50),
-                        ForeignKey('classifier_category.name')),
-                 Column('user', String(40)))
+                        ForeignKey('classifier_category.name'), primary_key=True),
+                 Column('user', String(40), primary_key=True))
 
 
@@ -151 +151 @@
         sel = word.select(and_(word.c.value==the_word,
                                word.c.user==self._user))
-        selection = sel.execute().fetchall()
+        selection = sel.execute().fetchone()
         cat_insert = word_category.insert()
 
-
-        if len(selection) == 0:
+        if selection is None:
             # new word, let's add it
             res = word.insert().execute(value=the_word, count=1,
@@ -169 +168 @@
             res = word.update(and_(word.c.value==the_word,
                                    word.c.user==self._user))
-            res.execute(count=selection[0].count+1)
-
-            sl = and_(word_category.c.word_value==the_word,
-                      word_category.c.user==self._user)
-            cat = word_category.select(sl)
-            cat = cat.execute().fetchall()
+            res.execute(count=selection.count+1)
+
+            #sl = and_(word_category.c.word_value==the_word,
+            #         word_category.c.user==self._user)
+            #cat = word_category.select(sl)
+            #cat = cat.execute().fetchall()
 
             #for old_cat in cat:
@@ -185 +184 @@
             #        word_category.delete(sl).execute()
 
+            existing_cats = self.list_categories()
             for category in categories:
                 # let's check if the category exists in category
-                if category not in self.list_categories():
+                if category not in existing_cats:
                     self.add_category(category)
 
@@ -194 +194 @@
                           word_category.c.word_value==the_word)
                 cat = word_category.select(sl)
-                cat = cat.execute().fetchall()
-
-                if cat == []:
+
+                cat = cat.execute().fetchone()
+                if cat is None:
                     cat_insert.execute(word_value=the_word,
                                        category_name=category,
@@ -202 +202 @@
 
                 else:
-                    cat_count = cat[0].count
-                    id_ = cat[0].id
-                    up = word_category.update(word_category.c.id==id_)
-                    up.execute(count=cat_count+1)
+                    up = word_category.update(and_(word_category.c.user==cat.user,
+                                   word_category.c.word_value==cat.word_value,
+                                   word_category.c.category_name==cat.category_name))
+                    up.execute(count=cat.count+1)
 
 
@@ -213 +213 @@
         selection = and_(word_category.c.word_value == word_value,
                          word_category.c.user==self._user)
-        catwords = word_category.select(selection).execute().fetchall()
+
+        catwords = word_category.select(selection).execute()
+
         word_sel =  and_(word.c.value == word_value,
-                         word_category.c.user==self._user)
+                         word.c.user==self._user)
+
         langs = [the_word.lang_iso for the_word in
-                 word.select(word_sel).execute().fetchall()]
+                 word.select(word_sel).execute()]
 
         cats = {}
@@ -240 +243 @@
         """Remove a word"""
         sl = and_(word.c.value==the_word, word.c.user==self._user)
-        results = word.select(sl).execute().fetchall()
-
-        if len(results) == 0:
+        the_word = word.select(sl).execute().fetchone()
+
+        if the_word is None:
             return None
-
-        the_word = results[0]
 
         # picking up categorized words to work with
         if categories is None:
             sl = word_category.c.word_value == the_word.value
-            catwords = word_category.select(sl).execute(user=self._user).fetchall()
+            catwords = word_category.select(sl).execute(user=self._user)
         else:
             categories = _tuplify(categories)
-            sl =  word_category.c.word_id == word.id
+            sl =  word_category.c.word_value == the_word.value
             sl2 =  word_category.c.category_name.in_(*categories)
             sl = and_(sl, sl2)
-            catwords = \
-                word_category.select(sl).execute(user=self._user).fetchall()
+            catwords = word_category.select(sl).execute(user=self._user)
 
         # remove categorized words
@@ -272 +272 @@
                 word_category.delete(sl).execute()
             else:
-                rs = word_category.select(sl).execute().fetchall()
-                if rs != []:
+                rs = word_category.select(sl).execute().fetchone()
+                rs_count = rs.count
+                rs.close()
+                if rs is not None:
                     sl2 = word_category.update(sl)
-                    sl2.execute(count=rs.count-1, user=self._user)
+                    sl2.execute(count=rs_count-1, user=self._user)
 
         # remove empty categories
         for category in categories:
-            sl = and_(word_category.c.category_name == category,
+            sl = and_(word_category.c.category_name==category,
                       word_category.c.user==self._user)
 
-            current_cat = word_category.select(sl).execute().fetchall()
-            if len(current_cat) > 0:
-                current_cat = current_cat[0]
+            current_cat = word_category.select(sl).execute().fetchone()
+            if current_cat is not None:
                 if current_cat.count == 0:
-                     word_category.delete(sl).execute()
-        else:
-            # remove categories
-            sl = and_(word_category.c.word_value==the_word.value,
-                      word_category.c.user==self._user)
-            word_category.delete(sl).execute()
+                    current_cat.close()
+                    word_category.delete(sl).execute()
+        #else:
+        #    # remove categories
+        #    sl = and_(word_category.c.word_value==the_word.value,
+        #              word_category.c.user==self._user)
+        #    word_category.delete(sl).execute()
 
         # removing word if none use it
         sl = and_(word.c.value==the_word.value, word.c.user==self._user)
-
-        #if word.select(sl).execute().fetchall()[0].count == 0:
-        word.delete(sl).execute()
+        if word.select(sl).execute().fetchone().count == 0:
+            word.delete(sl).execute()
 
     def word_count(self, category=None, language=None):
-
         if category is None:
             if language is None:
                 sl = word.c.user == self._user
-                return len(word.select(sl).execute().fetchall())
+                #return len(word.select(sl).execute().fetchall())
+                return word.select(sl).count().execute().fetchone()[0]
             else:
                 sl = and_(word.c.user == self._user,
                           word.c.lang_iso == language)
-                return len(word.select(sl).execute().fetchall())
+                return word.select(sl).count().execute().fetchone()[0]
+                #return len(word.select(sl).execute().fetchall())
         else:
             categories = _tuplify(category)
             in_ = word_category.c.category_name.in_(*categories)
             sl = and_(in_, word_category.c.user == self._user)
-            res = word_category.select(in_).execute()
-            return len(res.fetchall())
+            return word_category.select(sl).count().execute().fetchone()[0]
+            #res = word_category.select(sl).execute()
+            #return len(res.fetchall())