From e80fcc13fcffef68f7eccb7d0f135f08dce91f12 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 25 Apr 2009 12:22:39 -0700
Subject: [PATCH] More miscellaneous fixes

---
 src/calibre/ebooks/oeb/base.py                 | 5 ++++-
 src/calibre/ebooks/oeb/transforms/structure.py | 1 +
 src/calibre/gui2/dialogs/metadata_single.py    | 7 +++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index 33bb44840b..9d8598c766 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -941,7 +941,10 @@ class Manifest(object):
             href = urlunparse(purl)
             path, frag = urldefrag(href)
             if not path:
-                return '#'.join((self.href, frag))
+                if frag:
+                    return '#'.join((self.href, frag))
+                else:
+                    return self.href
             if '/' not in self.href:
                 return href
             dirname = os.path.dirname(self.href)
diff --git a/src/calibre/ebooks/oeb/transforms/structure.py b/src/calibre/ebooks/oeb/transforms/structure.py
index 197a265139..605cdaa7cf 100644
--- a/src/calibre/ebooks/oeb/transforms/structure.py
+++ b/src/calibre/ebooks/oeb/transforms/structure.py
@@ -102,6 +102,7 @@ class DetectStructure(object):
                                 play_order=self.oeb.toc.next_play_order())
 
 
+
     def elem_to_link(self, item, elem, counter):
         text = u' '.join([t.strip() for t in elem.xpath('descendant::text()')])
         text = text[:100].strip()
diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py
index e3e2080cc0..4d5471caf0 100644
--- a/src/calibre/gui2/dialogs/metadata_single.py
+++ b/src/calibre/gui2/dialogs/metadata_single.py
@@ -159,9 +159,12 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
         row = self.formats.currentRow()
         fmt = self.formats.item(row)
         if fmt is None:
-            error_dialog(self, _('No format selected'),
+            if self.formats.count() == 1:
+                fmt = self.formats.item(0)
+            if fmt is None:
+                error_dialog(self, _('No format selected'),
                     _('No format selected')).exec_()
-            return
+                return
         ext = fmt.ext.lower()
         if fmt.path is None:
             stream = self.db.format(self.row, ext, as_file=True)