Hello community,
here is the log from the commit of package tellico
checked in at Mon Jul 14 21:30:54 CEST 2008.
--------
--- KDE/tellico/tellico.changes 2008-06-16 11:23:42.000000000 +0200
+++ tellico/tellico.changes 2008-07-14 10:22:09.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Jul 14 10:21:43 CEST 2008 - stbinner@suse.de
+
+- update to 1.3.3:
+ * Fixed bug with file catalogs to properly match on file location
+ * Changed Arxiv fetcher to remove ID version number from results
+ * Updated drag-and-drop to allow HTTP urls, i.e. dragging bibtex
+ file from browser
+ * Updated Porbase in z39.50 server list
+ * Fixed copy() for text selection in main entry view
+
+-------------------------------------------------------------------
Old:
----
tellico-1.3.2.1.tar.bz2
New:
----
tellico-1.3.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tellico.spec ++++++
--- /var/tmp/diff_new_pack.Y10058/_old 2008-07-14 21:28:54.000000000 +0200
+++ /var/tmp/diff_new_pack.Y10058/_new 2008-07-14 21:28:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package tellico (Version 1.3.2.1)
+# spec file for package tellico (Version 1.3.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,7 +14,7 @@
Name: tellico
BuildRequires: kdemultimedia3-CD kdemultimedia3-devel libyaz-devel taglib-devel tcpd-devel
Summary: A book collection manager
-Version: 1.3.2.1
+Version: 1.3.3
Release: 1
License: GPL v2 or later
Group: Productivity/Other
@@ -70,6 +70,14 @@
%files lang -f %{name}.lang
%changelog
+* Mon Jul 14 2008 stbinner@suse.de
+- update to 1.3.3:
+ * Fixed bug with file catalogs to properly match on file location
+ * Changed Arxiv fetcher to remove ID version number from results
+ * Updated drag-and-drop to allow HTTP urls, i.e. dragging bibtex
+ file from browser
+ * Updated Porbase in z39.50 server list
+ * Fixed copy() for text selection in main entry view
* Mon Jun 16 2008 stbinner@suse.de
- update to 1.3.2.1:
* Added languages and editors to Amazon.com search.
++++++ tellico-1.3.2.1.tar.bz2 -> tellico-1.3.3.tar.bz2 ++++++
++++ 2294 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/ChangeLog new/tellico-1.3.3/ChangeLog
--- old/tellico-1.3.2.1/ChangeLog 2008-05-24 18:38:44.000000000 +0200
+++ new/tellico-1.3.3/ChangeLog 2008-07-10 07:30:27.000000000 +0200
@@ -1,3 +1,24 @@
+2008-07-09 Robby Stephenson
+
+ * Fixed EntryView to honor copy() command properly, for clipboard.
+ * Released Tellico 1.3.3.
+
+2008-06-24 Robby Stephenson
+
+ * Updated Porbase URL in z39.50 server list.
+
+2008-06-13 Robby Stephenson
+
+ * Updated drag-and-drop to allow HTTP urls.
+
+2008-06-12 Robby Stephenson
+
+ * Changed Arxiv fetcher to remove ID version number for results.
+
+2008-06-07 Robby Stephenson
+
+ * Fixed bug with merging file catalogs, to properly match on URL.
+
2008-05-24 Robby Stephenson
* Released Tellico 1.3.2.1.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/configure.in new/tellico-1.3.3/configure.in
--- old/tellico-1.3.2.1/configure.in 2008-05-24 18:43:54.000000000 +0200
+++ new/tellico-1.3.3/configure.in 2008-07-10 07:30:53.000000000 +0200
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(tellico, 1.3.2.1) dnl searches for some needed programs
+AM_INIT_AUTOMAKE(tellico, 1.3.3) dnl searches for some needed programs
KDE_SET_PREFIX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/configure.in.in new/tellico-1.3.3/configure.in.in
--- old/tellico-1.3.2.1/configure.in.in 2008-05-24 18:38:44.000000000 +0200
+++ new/tellico-1.3.3/configure.in.in 2008-07-10 07:30:27.000000000 +0200
@@ -1,6 +1,6 @@
#MIN_CONFIG(3.3)
-AM_INIT_AUTOMAKE(tellico,1.3.2.1)
+AM_INIT_AUTOMAKE(tellico,1.3.3)
dnl AM_KDE_MIN_VERSION(MIN-VERSION-MAJOR, MIN-VERSION-MINOR, MIN-VERSION-MICRO)
dnl (taken from KMyMoney2)
Files old/tellico-1.3.2.1/po/de.gmo and new/tellico-1.3.3/po/de.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/po/de.po new/tellico-1.3.3/po/de.po
--- old/tellico-1.3.2.1/po/de.po 2008-05-24 18:47:34.000000000 +0200
+++ new/tellico-1.3.3/po/de.po 2008-07-10 07:31:46.000000000 +0200
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: de\n"
"POT-Creation-Date: 2008-01-26 10:52-0800\n"
-"PO-Revision-Date: 2008-01-25 10:34+0100\n"
+"PO-Revision-Date: 2008-05-24 22:47+0200\n"
"Last-Translator: Jens Seidel \n"
"Language-Team: german \n"
"MIME-Version: 1.0\n"
@@ -1094,7 +1094,7 @@
#: collections/boardgamecollection.cpp:66
msgid "Designer"
-msgstr ""
+msgstr "Designer"
#: collections/boardgamecollection.cpp:72
msgid "Number of Players"
@@ -1792,7 +1792,7 @@
#: fetch/discogsfetcher.cpp:718
msgid "Discogs Link"
-msgstr ""
+msgstr "Discogs-Link"
#: newstuff/dialog.cpp:94
msgid "Get Hot New Stuff"
@@ -1986,9 +1986,8 @@
msgstr "Taste Audio-Dateien ab ..."
#: translators/audiofileimporter.cpp:129
-#, fuzzy
msgid "Bitrate"
-msgstr "Bibtex"
+msgstr "Bitrate"
#: translators/audiofileimporter.cpp:160 translators/audiofileimporter.cpp:170
msgid "Tracks (Disc %1)"
@@ -2023,14 +2022,12 @@
#: translators/audiofileimporter.cpp:352
msgid "Include &bitrate"
-msgstr ""
+msgstr "&Bitrate inkludieren"
#: translators/audiofileimporter.cpp:353
-#, fuzzy
msgid "If checked, the bitrate for each track is added to the entries."
msgstr ""
-"Wenn markiert, werden die Datei-Namen für jede Spur zu den Einträgen "
-"hinzugefügt."
+"Wenn markiert, wird die Bitrate für jede Spur zu den Einträgen hinzugefügt."
#: translators/csvexporter.cpp:40
msgid "CSV"
@@ -5369,7 +5366,7 @@
#: scripts.cpp:2
msgid "BoardGameGeek"
-msgstr ""
+msgstr "BoardGameGeek"
#: scripts.cpp:4
msgid "Dark Horse Comics"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/po/README new/tellico-1.3.3/po/README
--- old/tellico-1.3.2.1/po/README 2008-05-24 18:38:40.000000000 +0200
+++ new/tellico-1.3.3/po/README 2008-07-10 07:30:22.000000000 +0200
@@ -2,4 +2,22 @@
make package-messages
-from the top-level directory
+from the top-level directory.
+
+Please note that you need a special for KDE patched version of xgettext. You
+can obtain it from http://packages.ubuntu.com/de/edgy/gettext-kde. Don't forget
+to make this binary available as xgettext (instead of kde-xgettext) by e.g.
+creating a link in your search path.
+
+If you don't do this, code such as i18n("Comic Book Illustrator", "Artist")
+would correspond to two separate strings "Comic Book Illustrator" and
+"Artist" instead of a combined entry from which only the second one has to be
+translated:
+
+msgid ""
+"_: Comic Book Illustrator\n"
+"Artist"
+msgstr "Künstler"
+
+You also need the tool extractrc. In Debian it is available in the package
+kdesdk-scripts.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/collectionfieldsdialog.cpp new/tellico-1.3.3/src/collectionfieldsdialog.cpp
--- old/tellico-1.3.2.1/src/collectionfieldsdialog.cpp 2008-05-24 18:38:24.000000000 +0200
+++ new/tellico-1.3.3/src/collectionfieldsdialog.cpp 2008-07-10 07:30:04.000000000 +0200
@@ -254,7 +254,6 @@
// need to stretch at bottom
vbox->setStretchFactor(new QWidget(vbox), 1);
- KAcceleratorManager::manage(vbox);
// keep a default collection
m_defaultCollection = CollectionFactory::collection(m_coll->type(), true);
@@ -279,6 +278,9 @@
}
void CollectionFieldsDialog::slotSelectInitial() {
+ // the accel management is here so that it doesn't cause conflicts with the
+ // ones explicitly set in the constructor
+ KAcceleratorManager::manage(mainWidget());
m_fieldsBox->setSelected(0, true);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/collections/filecatalog.cpp new/tellico-1.3.3/src/collections/filecatalog.cpp
--- old/tellico-1.3.2.1/src/collections/filecatalog.cpp 2008-05-24 18:38:14.000000000 +0200
+++ new/tellico-1.3.3/src/collections/filecatalog.cpp 2008-07-10 07:29:53.000000000 +0200
@@ -102,4 +102,21 @@
return list;
}
+int FileCatalog::sameEntry(Data::EntryPtr entry1_, Data::EntryPtr entry2_) const {
+ // equal urls are always equal, even if modification time or something is different
+ if(Entry::compareValues(entry1_, entry2_, QString::fromLatin1("url"), this) > 0) {
+ return 100; // good match
+ }
+ // if volume or created time is different, it can't be same entry
+ if(Entry::compareValues(entry1_, entry2_, QString::fromLatin1("volume"), this) == 0 ||
+ Entry::compareValues(entry1_, entry2_, QString::fromLatin1("created"), this) == 0 ||
+ Entry::compareValues(entry1_, entry2_, QString::fromLatin1("size"), this) == 0) {
+ return 0;
+ }
+ int res = Entry::compareValues(entry1_, entry2_, QString::fromLatin1("title"), this);
+ res += Entry::compareValues(entry1_, entry2_, QString::fromLatin1("description"), this);
+ res += Entry::compareValues(entry1_, entry2_, QString::fromLatin1("mimetype"), this);
+ return res;
+}
+
#include "filecatalog.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/collections/filecatalog.h new/tellico-1.3.3/src/collections/filecatalog.h
--- old/tellico-1.3.2.1/src/collections/filecatalog.h 2008-05-24 18:38:14.000000000 +0200
+++ new/tellico-1.3.3/src/collections/filecatalog.h 2008-07-10 07:29:53.000000000 +0200
@@ -1,5 +1,5 @@
/***************************************************************************
- copyright : (C) 2005-2006 by Robby Stephenson
+ copyright : (C) 2005-2008 by Robby Stephenson
email : robby@periapsis.org
***************************************************************************/
@@ -29,6 +29,7 @@
FileCatalog(bool addFields, const QString& title = QString::null);
virtual Type type() const { return File; }
+ virtual int sameEntry(Data::EntryPtr entry1, Data::EntryPtr entry2) const;
static FieldVec defaultFields();
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/core/drophandler.cpp new/tellico-1.3.3/src/core/drophandler.cpp
--- old/tellico-1.3.2.1/src/core/drophandler.cpp 2008-05-24 18:38:19.000000000 +0200
+++ new/tellico-1.3.3/src/core/drophandler.cpp 2008-07-10 07:29:59.000000000 +0200
@@ -18,6 +18,8 @@
#include
#include
+#include
+#include
using Tellico::DropHandler;
@@ -62,7 +64,16 @@
bool hasUnknown = false;
KURL::List tc, pdf, bib, ris;
for(KURL::List::ConstIterator it = urls_.begin(); it != urls_.end(); ++it) {
- KMimeType::Ptr ptr = KMimeType::findByURL(*it);
+ KMimeType::Ptr ptr;
+ // findByURL doesn't work for http, so actually query
+ // the url itself
+ if((*it).protocol() != QString::fromLatin1("http")) {
+ ptr = KMimeType::findByURL(*it);
+ } else {
+ KIO::MimetypeJob* job = KIO::mimetype(*it, false /*progress*/);
+ KIO::NetAccess::synchronousRun(job, Kernel::self()->widget());
+ ptr = KMimeType::mimeType(job->mimetype());
+ }
if(ptr->is(QString::fromLatin1("application/x-tellico"))) {
tc << *it;
} else if(ptr->is(QString::fromLatin1("application/pdf"))) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/entry.cpp new/tellico-1.3.3/src/entry.cpp
--- old/tellico-1.3.2.1/src/entry.cpp 2008-05-24 18:38:24.000000000 +0200
+++ new/tellico-1.3.3/src/entry.cpp 2008-07-10 07:30:04.000000000 +0200
@@ -415,6 +415,16 @@
if(f->name() == Latin1Literal("lccn") && LCCNValidator::formalize(s1) == LCCNValidator::formalize(s2)) {
return 5;
}
+ if(f->name() == Latin1Literal("arxiv")) {
+ // normalize and unVersion arxiv ID
+ s1.remove(QRegExp(QString::fromLatin1("^arxiv:"), false));
+ s1.remove(QRegExp(QString::fromLatin1("v\\d+$")));
+ s2.remove(QRegExp(QString::fromLatin1("^arxiv:"), false));
+ s2.remove(QRegExp(QString::fromLatin1("v\\d+$")));
+ if(s1 == s2) {
+ return 5;
+ }
+ }
if(f->formatFlag() == Field::FormatName) {
s1 = e1->field(f, true).lower();
s2 = e2->field(f, true).lower();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/entry.h new/tellico-1.3.3/src/entry.h
--- old/tellico-1.3.2.1/src/entry.h 2008-05-24 18:38:24.000000000 +0200
+++ new/tellico-1.3.3/src/entry.h 2008-07-10 07:30:04.000000000 +0200
@@ -83,11 +83,6 @@
* The assignment operator is overloaded, since the id must be different.
*/
Entry& operator=(const Entry& other);
- /**
- * two entries are equal if all their field values are equal, except for
- * file catalogs which match on the url only
- */
- bool operator==(const Entry& other);
~Entry();
@@ -230,6 +225,12 @@
static QString dependentValue(ConstEntryPtr e, const QString& formatString, bool formatted);
private:
+ /**
+ * two entries are equal if all their field values are equal, except for
+ * file catalogs which match on the url only
+ */
+ bool operator==(const Entry& other);
+
CollPtr m_coll;
long m_id;
StringMap m_fields;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/entryview.cpp new/tellico-1.3.3/src/entryview.cpp
--- old/tellico-1.3.2.1/src/entryview.cpp 2008-05-24 18:38:24.000000000 +0200
+++ new/tellico-1.3.3/src/entryview.cpp 2008-07-10 07:30:04.000000000 +0200
@@ -26,6 +26,7 @@
#include "document.h"
#include "latin1literal.h"
#include "../core/drophandler.h"
+#include "../tellico_debug.h"
#include
#include
@@ -37,10 +38,22 @@
#include
#include
+#include
using Tellico::EntryView;
+using Tellico::EntryViewWidget;
-EntryView::EntryView(QWidget* parent_, const char* name_) : KHTMLPart(parent_, name_),
+EntryViewWidget::EntryViewWidget(KHTMLPart* part, QWidget* parent)
+ : KHTMLView(part, parent) {}
+
+// for the life of me, I could not figure out how to call the actual
+// KHTMLPartBrowserExtension::copy() slot, so this will have to do
+void EntryViewWidget::copy() {
+ QString text = part()->selectedText();
+ QApplication::clipboard()->setText(text, QClipboard::Clipboard);
+}
+
+EntryView::EntryView(QWidget* parent_, const char* name_) : KHTMLPart(new EntryViewWidget(this, parent_), parent_, name_),
m_entry(0), m_handler(0), m_run(0), m_tempFile(0), m_useGradientImages(true), m_checkCommonFile(true) {
setJScriptEnabled(false);
setJavaEnabled(false);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/entryview.h new/tellico-1.3.3/src/entryview.h
--- old/tellico-1.3.2.1/src/entryview.h 2008-05-24 18:38:24.000000000 +0200
+++ new/tellico-1.3.3/src/entryview.h 2008-07-10 07:30:04.000000000 +0200
@@ -20,6 +20,7 @@
#include "datavectors.h"
#include
+#include
#include
@@ -102,5 +103,15 @@
bool m_checkCommonFile : 1;
};
+// stupid naming on my part, I need to subclass the view to
+// add a slot. EntryView is really a part though
+class EntryViewWidget : public KHTMLView {
+Q_OBJECT
+public:
+ EntryViewWidget(KHTMLPart* part, QWidget* parent);
+public slots:
+ void copy();
+};
+
} //end namespace
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/fetch/arxivfetcher.cpp new/tellico-1.3.3/src/fetch/arxivfetcher.cpp
--- old/tellico-1.3.2.1/src/fetch/arxivfetcher.cpp 2008-05-24 18:38:15.000000000 +0200
+++ new/tellico-1.3.3/src/fetch/arxivfetcher.cpp 2008-07-10 07:29:55.000000000 +0200
@@ -226,6 +226,13 @@
}
}
}
+ QRegExp versionRx(QRegExp(QString::fromLatin1("v\\d+$")));
+ // if the original search was not for a versioned ID, remove it
+ if(m_key != ArxivID || !m_value.contains(versionRx)) {
+ QString arxiv = entry->field(QString::fromLatin1("arxiv"));
+ arxiv.remove(versionRx);
+ entry->setField(QString::fromLatin1("arxiv"), arxiv);
+ }
return entry;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/fetch/citebasefetcher.cpp new/tellico-1.3.3/src/fetch/citebasefetcher.cpp
--- old/tellico-1.3.2.1/src/fetch/citebasefetcher.cpp 2008-05-24 18:38:15.000000000 +0200
+++ new/tellico-1.3.3/src/fetch/citebasefetcher.cpp 2008-07-10 07:29:55.000000000 +0200
@@ -163,7 +163,15 @@
}
Tellico::Data::EntryPtr CitebaseFetcher::fetchEntry(uint uid_) {
- return m_entries[uid_];
+ Data::EntryPtr entry = m_entries[uid_];
+ QRegExp versionRx(QRegExp(QString::fromLatin1("v\\d+$")));
+ // if the original search was not for a versioned ID, remove it
+ if(m_key != ArxivID || !m_value.contains(versionRx)) {
+ QString arxiv = entry->field(QString::fromLatin1("arxiv"));
+ arxiv.remove(versionRx);
+ entry->setField(QString::fromLatin1("arxiv"), arxiv);
+ }
+ return entry;
}
KURL CitebaseFetcher::searchURL(FetchKey key_, const QString& value_) const {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/fetch/scripts/ministerio_de_cultura.py new/tellico-1.3.3/src/fetch/scripts/ministerio_de_cultura.py
--- old/tellico-1.3.2.1/src/fetch/scripts/ministerio_de_cultura.py 2008-05-24 18:38:14.000000000 +0200
+++ new/tellico-1.3.3/src/fetch/scripts/ministerio_de_cultura.py 2008-07-10 07:29:53.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# ***************************************************************************
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/fetch/z3950-servers.cfg new/tellico-1.3.3/src/fetch/z3950-servers.cfg
--- old/tellico-1.3.2.1/src/fetch/z3950-servers.cfg 2008-05-24 18:38:15.000000000 +0200
+++ new/tellico-1.3.3/src/fetch/z3950-servers.cfg 2008-07-10 07:29:55.000000000 +0200
@@ -43,9 +43,9 @@
Syntax=unimarc
[porbase]
-Host=z3950.bn.pt
+Host=z3950.porbase.org
Port=210
-Database=bnd
+Database=Default
Name=Portuguese National Library
Charset=iso-8859-1
Locale=pt
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/mainwindow.cpp new/tellico-1.3.3/src/mainwindow.cpp
--- old/tellico-1.3.2.1/src/mainwindow.cpp 2008-05-24 18:38:24.000000000 +0200
+++ new/tellico-1.3.3/src/mainwindow.cpp 2008-07-10 07:30:04.000000000 +0200
@@ -1847,6 +1847,10 @@
// if it isn't valid, hold off on applying the filter
QRegExp tx(text);
if(!tx.isValid()) {
+ text = QRegExp::escape(text);
+ tx.setPattern(text);
+ }
+ if(!tx.isValid()) {
myDebug() << "MainWindow::slotUpdateFilter() - invalid regexp: " << text << endl;
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/src/tellico_debug.h new/tellico-1.3.3/src/tellico_debug.h
--- old/tellico-1.3.2.1/src/tellico_debug.h 2008-05-24 18:38:24.000000000 +0200
+++ new/tellico-1.3.3/src/tellico_debug.h 2008-07-10 07:30:04.000000000 +0200
@@ -22,7 +22,7 @@
// std::clock_t
#include <ctime>
-// linux has __GNUC_PREREQ, NetBSD has __GNUC_PREQ__
+// linux has __GNUC_PREREQ, NetBSD has __GNUC_PREREQ__
#if defined(__GNUC_PREREQ) && !defined(__GNUC_PREREQ__)
#define __GNUC_PREREQ__ __GNUC_PREREQ
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/tellico.lsm new/tellico-1.3.3/tellico.lsm
--- old/tellico-1.3.2.1/tellico.lsm 2008-05-24 18:38:44.000000000 +0200
+++ new/tellico-1.3.3/tellico.lsm 2008-07-10 07:30:27.000000000 +0200
@@ -1,6 +1,6 @@
Begin4
Title: Tellico
-Version: 1.3.2.1
+Version: 1.3.3
Entered-date: 2007-04-08
Description: Tellico is a collection manager for books, bibliographies,
video, music, comic books, video games, coins, stamps,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/xslt/crossref2tellico.xsl new/tellico-1.3.3/xslt/crossref2tellico.xsl
--- old/tellico-1.3.2.1/xslt/crossref2tellico.xsl 2008-05-24 18:38:24.000000000 +0200
+++ new/tellico-1.3.3/xslt/crossref2tellico.xsl 2008-07-10 07:30:05.000000000 +0200
@@ -42,6 +42,10 @@
</tellico>
+<!-- ignore unresolved queries -->
+
+
+
<entry>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tellico-1.3.2.1/xslt/unixref2tellico.xsl new/tellico-1.3.3/xslt/unixref2tellico.xsl
--- old/tellico-1.3.2.1/xslt/unixref2tellico.xsl 2008-05-24 18:38:24.000000000 +0200
+++ new/tellico-1.3.3/xslt/unixref2tellico.xsl 2008-07-10 07:30:05.000000000 +0200
@@ -46,9 +46,12 @@
- <entry>
- xsl:apply-templates/
- </entry>
+ <!-- if there's an error, or none found, a crossref element still shows up, with an error element -->
+
+ <entry>
+ xsl:apply-templates/
+ </entry>
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org