From 6a8b4f9a21605ffe06a6ca4c8cb5263954eccb60 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Fri, 22 Jan 2010 11:36:24 -0700
Subject: [PATCH 1/2] GwR diagnostic for KG crash

---
 src/calibre/gui2/catalog/catalog_epub_mobi.ui | 39 +++++++++++++++----
 src/calibre/library/catalog.py                |  1 +
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.ui b/src/calibre/gui2/catalog/catalog_epub_mobi.ui
index f8a515e4ec..9714df1e63 100644
--- a/src/calibre/gui2/catalog/catalog_epub_mobi.ui
+++ b/src/calibre/gui2/catalog/catalog_epub_mobi.ui
@@ -17,7 +17,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>20</y>
+     <y>70</y>
      <width>241</width>
      <height>21</height>
     </rect>
@@ -36,7 +36,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>50</y>
+     <y>100</y>
      <width>241</width>
      <height>17</height>
     </rect>
@@ -49,7 +49,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>110</y>
+     <y>160</y>
      <width>171</width>
      <height>17</height>
     </rect>
@@ -62,7 +62,7 @@
    <property name="geometry">
     <rect>
      <x>300</x>
-     <y>20</y>
+     <y>70</y>
      <width>231</width>
      <height>22</height>
     </rect>
@@ -78,7 +78,7 @@
    <property name="geometry">
     <rect>
      <x>300</x>
-     <y>50</y>
+     <y>100</y>
      <width>231</width>
      <height>22</height>
     </rect>
@@ -94,7 +94,7 @@
    <property name="geometry">
     <rect>
      <x>300</x>
-     <y>80</y>
+     <y>130</y>
      <width>231</width>
      <height>22</height>
     </rect>
@@ -110,7 +110,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>80</y>
+     <y>130</y>
      <width>241</width>
      <height>17</height>
     </rect>
@@ -123,7 +123,7 @@
    <property name="geometry">
     <rect>
      <x>300</x>
-     <y>110</y>
+     <y>160</y>
      <width>231</width>
      <height>22</height>
     </rect>
@@ -135,6 +135,29 @@
     <string>*</string>
    </property>
   </widget>
+  <widget class="QLabel" name="label_5">
+   <property name="geometry">
+    <rect>
+     <x>61</x>
+     <y>20</y>
+     <width>461</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>14</pointsize>
+     <weight>75</weight>
+     <bold>true</bold>
+    </font>
+   </property>
+   <property name="text">
+    <string>Special Tags for Catalog Creation</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
  </widget>
  <resources/>
  <connections/>
diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py
index 44431e73fe..88709f1e18 100644
--- a/src/calibre/library/catalog.py
+++ b/src/calibre/library/catalog.py
@@ -2453,6 +2453,7 @@ class EPUB_MOBI(CatalogPlugin):
             for (i,word) in enumerate(title_words):
                 hit = re.search('[0-9]+',word)
                 if hit :
+                    print "library.catalog:CatalogBuilder.generateSortTitle(): translating '%s'" % word
                     translated.append(EPUB_MOBI.NumberToText(word).text)
                 else:
                     translated.append(word)

From bd39c9edb4b3514f308bd95b5b631eb80605db25 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Fri, 22 Jan 2010 13:17:06 -0700
Subject: [PATCH 2/2] GwR fixed colon bug in NumberTranslate

---
 src/calibre/gui2/catalog/catalog_epub_mobi.ui | 148 ------------------
 src/calibre/library/catalog.py                |   6 +-
 2 files changed, 4 insertions(+), 150 deletions(-)

diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.ui b/src/calibre/gui2/catalog/catalog_epub_mobi.ui
index 2d08aeed52..e683c479bf 100644
--- a/src/calibre/gui2/catalog/catalog_epub_mobi.ui
+++ b/src/calibre/gui2/catalog/catalog_epub_mobi.ui
@@ -13,153 +13,6 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-<<<<<<< TREE
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>70</y>
-     <width>241</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Tags to exclude as genres (regex):</string>
-   </property>
-   <property name="textFormat">
-    <enum>Qt::LogText</enum>
-   </property>
-   <property name="wordWrap">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_2">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>100</y>
-     <width>241</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>'Don't include this book' tag:</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_4">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>160</y>
-     <width>171</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Additional note tag prefix:</string>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="exclude_genre">
-   <property name="geometry">
-    <rect>
-     <x>300</x>
-     <y>70</y>
-     <width>231</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="toolTip">
-    <string extracomment="Tooltip comment here"/>
-   </property>
-   <property name="text">
-    <string>\[[\w ]*\]</string>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="exclude_tags">
-   <property name="geometry">
-    <rect>
-     <x>300</x>
-     <y>100</y>
-     <width>231</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="toolTip">
-    <string extracomment="Tooltip comment here"/>
-   </property>
-   <property name="text">
-    <string>~</string>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="read_tag">
-   <property name="geometry">
-    <rect>
-     <x>300</x>
-     <y>130</y>
-     <width>231</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="toolTip">
-    <string extracomment="Tooltip comment here"/>
-   </property>
-   <property name="text">
-    <string>+</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_3">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>130</y>
-     <width>241</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>'Mark this book as read' tag:</string>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="note_tag">
-   <property name="geometry">
-    <rect>
-     <x>300</x>
-     <y>160</y>
-     <width>231</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="toolTip">
-    <string extracomment="Tooltip comment here"/>
-   </property>
-   <property name="text">
-    <string>*</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_5">
-   <property name="geometry">
-    <rect>
-     <x>61</x>
-     <y>20</y>
-     <width>461</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>14</pointsize>
-     <weight>75</weight>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string>Special Tags for Catalog Creation</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
-=======
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="label">
@@ -237,7 +90,6 @@
     </widget>
    </item>
   </layout>
->>>>>>> MERGE-SOURCE
  </widget>
  <resources/>
  <connections/>
diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py
index 6af2a8eb93..dbcf2df679 100644
--- a/src/calibre/library/catalog.py
+++ b/src/calibre/library/catalog.py
@@ -375,7 +375,10 @@ class EPUB_MOBI(CatalogPlugin):
                 self.text = ''.join(result)
 
             else:
-                number = int(self.number)
+                try:
+                    number = int(self.number)
+                except:
+                    return
 
                 if number > 1000000:
                     self.text = "%d out of range" % number
@@ -2449,7 +2452,6 @@ class EPUB_MOBI(CatalogPlugin):
             for (i,word) in enumerate(title_words):
                 hit = re.search('[0-9]+',word)
                 if hit :
-                    print "library.catalog:CatalogBuilder.generateSortTitle(): translating '%s'" % word
                     translated.append(EPUB_MOBI.NumberToText(word).text)
                 else:
                     translated.append(word)