mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use books.google.cn for Book Search -- doesn't exist. Also a few tiny tweaks.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@965 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-06-08 17:00:09 +00:00
parent 9bc1fe4695
commit 96025842a1
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
android/src/com/google/zxing/client/android/LocaleManager.java
View file

@ -43,10 +43,17 @@ public final class LocaleManager {
// Google Product Search for mobile is available in fewer countries than web search. // Google Product Search for mobile is available in fewer countries than web search.
private static final Map<Locale,String> GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD; private static final Map<Locale,String> GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD;
static { static {
GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD = new HashMap<Locale,String>(); GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD = new HashMap<Locale,String>(3);
GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put(Locale.UK, "co.uk"); GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put(Locale.UK, "co.uk");
} }
private static final Map<Locale,String> GOOGLE_BOOK_SEARCH_COUNTRY_TLD;
static {
GOOGLE_BOOK_SEARCH_COUNTRY_TLD = new HashMap<Locale,String>(13);
GOOGLE_BOOK_SEARCH_COUNTRY_TLD.putAll(GOOGLE_COUNTRY_TLD);
GOOGLE_BOOK_SEARCH_COUNTRY_TLD.remove(Locale.CHINA);
}
private LocaleManager() {} private LocaleManager() {}
/** /**
@ -54,15 +61,7 @@ public final class LocaleManager {
* (e.g. "co.uk" for the United Kingdom) * (e.g. "co.uk" for the United Kingdom)
*/ */
public static String getCountryTLD() { public static String getCountryTLD() {
Locale locale = Locale.getDefault(); return doGetTLD(GOOGLE_COUNTRY_TLD);
if (locale == null) {
return DEFAULT_TLD;
}
String tld = GOOGLE_COUNTRY_TLD.get(locale);
if (tld == null) {
return DEFAULT_TLD;
}
return tld;
} }
/** /**
@ -70,11 +69,24 @@ public final class LocaleManager {
* @return The top-level domain to use. * @return The top-level domain to use.
*/ */
public static String getProductSearchCountryTLD() { public static String getProductSearchCountryTLD() {
return doGetTLD(GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD);
}
/**
* The same as above, but specifically for Google Book Search.
* @return The top-level domain to use.
*/
public static String getBookSearchCountryTLD() {
return doGetTLD(GOOGLE_BOOK_SEARCH_COUNTRY_TLD);
}
private static String doGetTLD(Map<Locale,String> map) {
Locale locale = Locale.getDefault(); Locale locale = Locale.getDefault();
if (locale == null) { if (locale == null) {
return DEFAULT_TLD; return DEFAULT_TLD;
} }
String tld = GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.get(locale); String tld = map.get(locale);
if (tld == null) { if (tld == null) {
return DEFAULT_TLD; return DEFAULT_TLD;
} }

7
android/src/com/google/zxing/client/android/result/ResultHandler.java
View file

@ -138,8 +138,7 @@ public abstract class ResultHandler {
long milliseconds = date.getTime(); long milliseconds = date.getTime();
if (when.length() == 16 && when.charAt(15) == 'Z') { if (when.length() == 16 && when.charAt(15) == 'Z') {
Calendar calendar = new GregorianCalendar(); Calendar calendar = new GregorianCalendar();
int offset = (calendar.get(java.util.Calendar.ZONE_OFFSET) + int offset = calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET);
calendar.get(java.util.Calendar.DST_OFFSET));
milliseconds += offset; milliseconds += offset;
} }
return milliseconds; return milliseconds;
@ -261,8 +260,8 @@ public abstract class ResultHandler {
} }
public final void openBookSearch(String isbn) { public final void openBookSearch(String isbn) {
Uri uri = Uri.parse("http://books.google." + LocaleManager.getCountryTLD() + "/books?vid=isbn" + Uri uri = Uri.parse("http://books.google." + LocaleManager.getBookSearchCountryTLD() +
isbn); "/books?vid=isbn" + isbn);
launchIntent(new Intent(Intent.ACTION_VIEW, uri)); launchIntent(new Intent(Intent.ACTION_VIEW, uri));
} }