mirror of
https://github.com/jfoucry/Pilldroid.git
synced 2024-11-14 01:21:35 +01:00
Suppress unused code; clean import;
Solve curso bug; initialize some varaibles
This commit is contained in:
parent
4cb8790047
commit
2cc015fd48
1 changed files with 12 additions and 13 deletions
|
@ -3,7 +3,6 @@ package net.foucry.pilldroid;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.database.Cursor;
|
import android.database.Cursor;
|
||||||
import android.database.sqlite.SQLiteDatabase;
|
import android.database.sqlite.SQLiteDatabase;
|
||||||
import android.database.sqlite.SQLiteException;
|
|
||||||
import android.database.sqlite.SQLiteOpenHelper;
|
import android.database.sqlite.SQLiteOpenHelper;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
|
@ -23,7 +22,7 @@ class DBMedoc extends SQLiteOpenHelper {
|
||||||
|
|
||||||
private static String dbName = "medicaments.db";
|
private static String dbName = "medicaments.db";
|
||||||
private final Context myContext;
|
private final Context myContext;
|
||||||
private SQLiteDatabase myDataBase;
|
private SQLiteDatabase myDataBase = null;
|
||||||
|
|
||||||
private static final String TABLE_NAME = "medicaments";
|
private static final String TABLE_NAME = "medicaments";
|
||||||
private static final String MEDOC_CIS = "cis";
|
private static final String MEDOC_CIS = "cis";
|
||||||
|
@ -48,7 +47,6 @@ class DBMedoc extends SQLiteOpenHelper {
|
||||||
File dbFile = myContext.getDatabasePath(dbName);
|
File dbFile = myContext.getDatabasePath(dbName);
|
||||||
|
|
||||||
if (!dbFile.exists()) {
|
if (!dbFile.exists()) {
|
||||||
SQLiteDatabase db = super.getWritableDatabase();
|
|
||||||
copyDatabase(dbFile.getPath());
|
copyDatabase(dbFile.getPath());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,7 +59,6 @@ class DBMedoc extends SQLiteOpenHelper {
|
||||||
|
|
||||||
if (dbFile.exists()) return super.getReadableDatabase();
|
if (dbFile.exists()) return super.getReadableDatabase();
|
||||||
|
|
||||||
SQLiteDatabase db = super.getReadableDatabase();
|
|
||||||
copyDatabase(dbFile.getPath());
|
copyDatabase(dbFile.getPath());
|
||||||
return super.getReadableDatabase();
|
return super.getReadableDatabase();
|
||||||
}
|
}
|
||||||
|
@ -94,12 +91,12 @@ class DBMedoc extends SQLiteOpenHelper {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void openDatabase() throws SQLiteException {
|
/* void openDatabase() throws SQLiteException {
|
||||||
Log.e(TAG, "openDatabase called");
|
Log.e(TAG, "openDatabase called");
|
||||||
String myPath = myContext.getDatabasePath(dbName).getPath();
|
String myPath = myContext.getDatabasePath(dbName).getPath();
|
||||||
|
|
||||||
myDataBase = SQLiteDatabase.openDatabase(myPath, null, SQLiteDatabase.OPEN_READONLY);
|
myDataBase = SQLiteDatabase.openDatabase(myPath, null, SQLiteDatabase.OPEN_READONLY);
|
||||||
}
|
}*/
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized void close() {
|
public synchronized void close() {
|
||||||
|
@ -120,17 +117,19 @@ class DBMedoc extends SQLiteOpenHelper {
|
||||||
SQLiteDatabase db = this.getReadableDatabase();
|
SQLiteDatabase db = this.getReadableDatabase();
|
||||||
|
|
||||||
// Build query
|
// Build query
|
||||||
/*Cursor cursor = db.query(TABLE_NAME, // Which table
|
Cursor cursor = db.query(TABLE_NAME, // Which table
|
||||||
COLUMNS_NAMES, // column names
|
COLUMNS_NAMES, // column names
|
||||||
" cip13 =?", // selections
|
" cip13 =?", // selections
|
||||||
new String[]{cip13}, // selections args
|
new String[]{cip13}, // selections args
|
||||||
null, // group by
|
null, // group by
|
||||||
null, // having
|
null, // having
|
||||||
null, // order by
|
null, // order by
|
||||||
null); // limits*/
|
null); // limits
|
||||||
Cursor cursor = db.rawQuery("SELECT * FROM " + TABLE_NAME + " where cip13 = " + cip13, null);
|
//Cursor cursor = db.rawQuery("SELECT * FROM " + TABLE_NAME + " where cip13 = " + cip13, null);
|
||||||
if (cursor.getCount() != 0) {
|
if (cursor.getCount() != 0) {
|
||||||
|
|
||||||
|
cursor.moveToFirst();
|
||||||
|
|
||||||
// Build medicament object
|
// Build medicament object
|
||||||
Medicament medicament = new Medicament();
|
Medicament medicament = new Medicament();
|
||||||
// medicament.setId(Integer.parseInt(cursor.getString(0)));
|
// medicament.setId(Integer.parseInt(cursor.getString(0)));
|
||||||
|
|
Loading…
Reference in a new issue