Permalink
Browse files

Merge branch 'master' of git://github.com/nobnago/Anki-Android

  • Loading branch information...
2 parents 5325d5f + eeb4e7e commit 29ee8fc4921b1c42f171278b3cb608925583f932 @iniju committed May 23, 2012
Showing with 13 additions and 4 deletions.
  1. +1 −1 AndroidManifest.xml
  2. +10 −2 src/com/ichi2/libanki/Collection.java
  3. +2 −1 src/com/ichi2/libanki/Finder.java
View
@@ -20,7 +20,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.ichi2.anki2"
- android:versionName="2.0alpha33-EXPERIMENTAL"
+ android:versionName="2.0alpha34-EXPERIMENTAL"
android:versionCode="26"
android:installLocation="auto">
<instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="com.ichi2.anki2"></instrumentation>
@@ -879,10 +879,18 @@ public void updateFieldCache(long[] nids) {
*/
/** Return a list of card ids */
+ public ArrayList<Long> findCards(String search) {
+ return new Finder(this).findCards(search, false, null);
+ }
+ /** Return a list of card ids */
public ArrayList<Long> findCards(String search, String order) {
- return new Finder(this).findCards(search, order);
+ return new Finder(this).findCards(search, false, order);
}
-
+ /** Return a list of card ids */
+ public ArrayList<Long> findCards(String search, boolean full) {
+ return new Finder(this).findCards(search, full, null);
+ }
+
/** Return a list of card ids */
public ArrayList<HashMap<String, String>> findCardsForCardBrowser(boolean wholeCollection) {
ArrayList<HashMap<String, String>> data = new ArrayList<HashMap<String, String>>();
@@ -80,9 +80,10 @@ public Finder(Collection col) {
}
/** Return a list of card ids for QUERY */
- public ArrayList<Long> findCards(String query, String order) {
+ public ArrayList<Long> findCards(String query, boolean full, String order) {
mOrder = order;
mQuery = query;
+ mFull = full;
_findLimits();
try {
if (!mLims.getBoolean("valid")) {

0 comments on commit 29ee8fc

Please sign in to comment.