diff --git a/os2web_adlib_api.make b/os2web_adlib_api.make
deleted file mode 100644
index 28aad89..0000000
--- a/os2web_adlib_api.make
+++ /dev/null
@@ -1,22 +0,0 @@
-api = 2
-core = 7.x
-
-;; OS2Web projects:
-
-; OS2Web Modules
-
-;; Contrib modules below:
-
-; Libraries
-
-; Contrib modules
-
-; Features + related
-
-;Views
-
-
-; Basic
-
-projects[features][subdir] = "contrib"
-projects[features][version] = "2.0-beta2"
diff --git a/os2web_adlib_api.module b/os2web_adlib_api.module
index cc7d9da..a58fdb4 100644
--- a/os2web_adlib_api.module
+++ b/os2web_adlib_api.module
@@ -262,7 +262,7 @@ function os2web_adlib_api_status() {
);
}
}
- drupal_add_js(drupal_get_path('module', 'os2web_adlib_api') . '/os2web_adlib_api.js', 'file');
+ drupal_add_js(drupal_get_path('module', 'os2web_adlib_api') . '/js/os2web_adlib_api.js', 'file');
$html = '
Connector information
';
$html .= theme('table', array('header' => $head, 'rows' => $rows));
$head = array('Fid', 'Job-id', 'Status', 'action');
@@ -417,7 +417,12 @@ function os2web_adlib_api_convert_to_pdf($fid, $docref = NULL) {
'did' => $docref,
'jobtype' => 0,
);
- drupal_write_record('os2web_adlib_api_doc_files', $record, array('fid', 'jobtype'));
+ db_delete('os2web_adlib_api_doc_files')
+ ->condition('fid', $fid)
+ ->condition('did', $docref)
+ ->condition('jobtype', 0)
+ ->execute();
+ drupal_write_record('os2web_adlib_api_doc_files', $record);
if (ADLIB_TEST_FID) {
error_log(basename(__FILE__) . ':' . __LINE__ . " jm@bellcom.dk: File queued for processing.");
}
@@ -435,7 +440,12 @@ function os2web_adlib_api_convert_to_pdf($fid, $docref = NULL) {
'did' => $docref,
'job_id' => 'Complete',
);
- drupal_write_record('os2web_adlib_api_doc_files', $record, array('fid', 'jobtype'));
+ db_delete('os2web_adlib_api_doc_files')
+ ->condition('fid', $fid)
+ ->condition('did', $docref)
+ ->condition('jobtype', 0)
+ ->execute();
+ drupal_write_record('os2web_adlib_api_doc_files', $record);
return FALSE;
}
}