~paulbrianstewart/ubuntu/oneiric/tellico/852247-Formatting-Fix

« back to all changes in this revision

Viewing changes to src/collection.cpp

Committer: Bazaar Package Importer
Author(s): Regis Boudin
Date: 2008-05-23 21:28:59 UTC
mfrom: (0.1.14 upstream) (2.1.1 etch)
Revision ID: james.westby@ubuntu.com-20080523212859-n0gl4ap37xb0uj1a

Tags: 1.3.2-1

http://bugs.debian.org/478975

* New upstream release.
* Recommend khelpcenter for acces to the help (Closes: #478975).

files added:
debian/tellico-scripts.install

src/fetch/discogsfetcher.cpp

src/fetch/discogsfetcher.h

src/fetch/googlescholarfetcher.cpp

src/fetch/googlescholarfetcher.h

src/lccnvalidator.cpp

src/lccnvalidator.h

xslt/discogs2tellico.xsl

xslt/tellico2gcstar.xsl

xslt/unixref2tellico.xsl

files modified:
ChangeLog

admin/config.guess

admin/config.sub

configure

configure.in

configure.in.in

debian/changelog

debian/control

debian/copyright

debian/rules

debian/tellico-data.install

debian/tellico.1x

debian/tellico.install

doc/CMakeLists.txt

doc/en/CMakeLists.txt

doc/en/hacking.docbook

doc/en/importing-exporting.docbook

po/CMakeLists.txt

po/en_GB.gmo

po/en_GB.po

po/es.gmo

po/es.po

po/fi.gmo

po/fi.po

po/fr.gmo

po/fr.po

po/hu.gmo

po/hu.po

po/nn.gmo

po/nn.po

po/pt.gmo

po/pt.po

po/ru.gmo

po/ru.po

po/sv.gmo

po/sv.po

src/Makefile.am

src/Makefile.in

src/barcode/barcode.h

src/calendarhandler.h

src/collection.cpp

src/collections/bibtexcollection.cpp

src/collections/bookcollection.cpp

src/collections/videocollection.cpp

src/commands/addentries.cpp

src/detailedlistview.cpp

src/document.cpp

src/entry.cpp

src/entryeditdialog.cpp

src/entrygroupitem.cpp

src/fetch/Makefile.am

src/fetch/Makefile.in

src/fetch/arxivfetcher.cpp

src/fetch/crossreffetcher.cpp

src/fetch/entrezfetcher.cpp

src/fetch/entrezfetcher.h

src/fetch/execexternalfetcher.cpp

src/fetch/fetch.h

src/fetch/fetchmanager.cpp

src/fetch/fetchmanager.h

src/fetch/imdbfetcher.cpp

src/fetch/imdbfetcher.h

src/fetch/scripts/boardgamegeek.rb

src/fetch/scripts/ministerio_de_cultura.py

src/fetch/srufetcher.cpp

src/fetch/srufetcher.h

src/fetch/yahoofetcher.cpp

src/fetch/yahoofetcher.h

src/fetch/z3950connection.cpp

src/fetch/z3950fetcher.cpp

src/fetch/z3950fetcher.h

src/fetchdialog.cpp

src/fetcherconfigdialog.cpp

src/fetcherconfigdialog.h

src/field.cpp

src/filehandler.cpp

src/filehandler.h

src/filterdialog.cpp

src/gui/datewidget.cpp

src/gui/ratingwidget.cpp

src/image.cpp

src/image.h

src/imagefactory.cpp

src/importdialog.cpp

src/importdialog.h

src/loandialog.cpp

src/mainwindow.cpp

src/reportdialog.cpp

src/tellico_debug.h

src/translators/alexandriaimporter.cpp

src/translators/amcimporter.cpp

src/translators/audiofileimporter.cpp

src/translators/bibtexexporter.cpp

src/translators/bibtexhandler.cpp

src/translators/bibteximporter.cpp

src/translators/bibtexmlexporter.cpp

src/translators/bibtexmlimporter.cpp

src/translators/deliciousimporter.cpp

src/translators/exporter.h

src/translators/freedb_util.cpp

src/translators/freedbimporter.cpp

src/translators/gcfilmsimporter.cpp

src/translators/grs1importer.cpp

src/translators/pdfimporter.cpp

src/translators/risimporter.cpp

src/translators/tellicoimporter.cpp

src/translators/tellicoxmlexporter.cpp

src/translators/tellicozipexporter.cpp

src/translators/textimporter.cpp

src/translators/translators.h

tellico.lsm

xslt/MARC21slim2MODS3.xsl

xslt/Makefile.am

xslt/Makefile.in

xslt/amazon2tellico.xsl

xslt/crossref2tellico.xsl

xslt/delicious2tellico.xsl

xslt/entry-templates/Default.xsl

xslt/entry-templates/Fancy.xsl

xslt/gcstar2tellico.xsl

xslt/mods2tellico.xsl

xslt/pubmed2tellico.xsl

xslt/tellico2html.xsl

Show diffs side-by-side

added added

removed removed

src/collection.cpp

807

// merges values from e2 into e1

808

bool Collection::mergeEntry(EntryPtr e1, EntryPtr e2, bool overwrite_, bool askUser_) {

809

if(!e1 || !e2) {

810

myDebug() << "Collection::mergeEntry() - bad entry pointer" << endl;

810

811

return false;

811

812

}

812

813

bool ret = true;

815

816

if(e2->field(field).isEmpty()) {

816

817

continue;

817

818

}

819

// myLog() << "Collection::mergeEntry() - reading field: " << field->name() << endl;

818

820

if(overwrite_ || e1->field(field).isEmpty()) {

819

821

// myLog() << e1->title() << ": updating field(" << field->name() << ") to " << e2->field(field->name()) << endl;

820

822

e1->setField(field, e2->field(field));

Older »