[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/office/tellico/src/fetch
From:       Robby Stephenson <robby () periapsis ! org>
Date:       2010-05-01 22:31:28
Message-ID: 20100501223128.35FA5AC8AB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1121619 by rstephenson:

amazon canada messes up the video search too, so switch to dvd

 M  +12 -3     amazonfetcher.cpp  
 M  +1 -1      amazonfetcher.h  


--- trunk/extragear/office/tellico/src/fetch/amazonfetcher.cpp #1121618:1121619
@@ -124,6 +124,15 @@
          || type == Data::Collection::BoardGame;
 }
 
+bool AmazonFetcher::canSearch(FetchKey k) const {
+  // no UPC in Canada
+  return k == Title
+         || k == Person
+         || k == ISBN
+         || (k == UPC && m_site != CA)
+         || k == Keyword;
+}
+
 void AmazonFetcher::readConfigHook(const KConfigGroup& config_) {
   const int site = config_.readEntry("Site", int(Unknown));
   Q_ASSERT(site != Unknown);
@@ -201,9 +210,9 @@
       break;
 
     case Data::Collection::Video:
-      // JP appears to have a bug where Video only returns VHS results
-      // DVD will return DVD, Blu-ray, etc. so just ignore VHS for JP users
-      if(m_site == JP) {
+      // CA and JP appear to have a bug where Video only returns VHS or Music \
results +      // DVD will return DVD, Blu-ray, etc. so just ignore VHS for those \
users +      if(m_site == CA || m_site == JP) {
         params.insert(QLatin1String("SearchIndex"), QLatin1String("DVD"));
       } else {
         params.insert(QLatin1String("SearchIndex"), QLatin1String("Video"));
--- trunk/extragear/office/tellico/src/fetch/amazonfetcher.h #1121618:1121619
@@ -86,7 +86,7 @@
   virtual bool isSearching() const { return m_started; }
   virtual void continueSearch();
   // amazon can search title, person, isbn, or keyword. No Raw for now.
-  virtual bool canSearch(FetchKey k) const { return k == Title || k == Person || k \
== ISBN || k == UPC || k == Keyword; } +  virtual bool canSearch(FetchKey k) const;
   virtual void stop();
   virtual Data::EntryPtr fetchEntryHook(uint uid);
   virtual Type type() const { return Amazon; }


[prev in list] [next in list] [prev in thread] [next in thread]