@@ -28,10 +28,12 @@
 (use canvas-draw)
 (import canvas-draw-iup)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69)
 (import (prefix sqlite3 sqlite3:))
+(include "/nfs/site/disks/icf_fdk_cw_gwa002/srehman/fossil/dbi/dbi.scm")
+(import (prefix dbi dbi:))
 
 (declare (uses configf))
 (declare (uses tree))
 (declare (uses margs))
 ;; (declare (uses dcommon))
@@ -114,11 +116,11 @@
 ;;======================================================================
 
 (define (datashare:initialize-db db)
   (for-each
    (lambda (qry)
-     (sqlite3:execute db qry))
+     (dbi:exec db qry))
    (list 
     "CREATE TABLE pkgs 
          (id           INTEGER PRIMARY KEY,
           area         TEXT,
           version_name TEXT,
@@ -144,45 +146,45 @@
           path       TEXT);")))
 
 (define (datashare:register-data db area version-name store-type submitter quality source-path comment)
   (let ((iter-qry       (sqlite3:prepare db "SELECT max(iteration) FROM pkgs WHERE area=? AND version_name=?;"))
 	(next-iteration 0))
-    (sqlite3:with-transaction
+    (dbi:with-transaction
      db
      (lambda ()
-       (sqlite3:for-each-row
+       (dbi:for-each-row
 	(lambda (iteration)
 	  (if (and (number? iteration)
 		   (>= iteration next-iteration))
 	      (set! next-iteration (+ iteration 1))))
 	iter-qry area version-name)
        ;; now store the data
-       (sqlite3:execute db "INSERT INTO pkgs (area,version_name,iteration,store_type,submitter,source_path,quality,comment) 
+       (dbi:exec db "INSERT INTO pkgs (area,version_name,iteration,store_type,submitter,source_path,quality,comment) 
                                  VALUES (?,?,?,?,?,?,?,?);"
 			area version-name next-iteration (conc store-type) submitter source-path quality comment)))
-    (sqlite3:finalize! iter-qry)
+    (dbi:close iter-qry)
     next-iteration))
 
 (define (datashare:get-id db area version-name iteration)
   (let ((res #f))
-    (sqlite3:for-each-row
+    (dbi:for-each-row
      (lambda (id)
        (set! res id))
      db
      "SELECT id FROM pkgs WHERE area=? AND version_name=? AND iteration=?;"
      area version-name iteration)
     res))
 
 (define (datashare:set-stored-path db id path)
-  (sqlite3:execute db "UPDATE pkgs SET stored_path=? WHERE id=?;" path id))
+  (dbi:exec db "UPDATE pkgs SET stored_path=? WHERE id=?;" path id))
 
 (define (datashare:set-copied db id value)
-  (sqlite3:execute db "UPDATE pkgs SET copied=? WHERE id=?;" value id))
+  (dbi:exec db "UPDATE pkgs SET copied=? WHERE id=?;" value id))
   
 (define (datashare:get-pkg-record db area version-name iteration)
   (let ((res #f))
-    (sqlite3:for-each-row
+    (dbi:for-each-row
      (lambda (a . b)
        (set! res (apply vector a b)))
      db 
      "SELECT * FROM pkgs WHERE area=? AND version_name=? AND iteration=?;"
      area 
@@ -206,15 +208,15 @@
 ;; if there is nothing at that location then the record can be removed
 ;; if there are no refs for a particular pkg-id then that pkg-id is a 
 ;; candidate for removal
 ;;
 (define (datashare:record-pkg-ref db pkg-id dest-link)
-  (sqlite3:execute db "INSERT INTO refs (pkg_id,destlink) VALUES (?,?);" pkg-id dest-link))
+  (dbi:exec db "INSERT INTO refs (pkg_id,destlink) VALUES (?,?);" pkg-id dest-link))
   
 (define (datashare:count-refs db pkg-id)
   (let ((res 0))
-    (sqlite3:for-each-row
+    (dbi:for-each-row
      (lambda (count)
        (set! res count))
      db
      "SELECT count(id) FROM refs WHERE pkg_id=?;"
      pkg-id)
@@ -234,12 +236,12 @@
 	   exn
 	   (begin
 	     (debug:print 2 *default-log-port* "ERROR: problem accessing db " dbpath
 			  ((condition-property-accessor 'exn 'message) exn))
 	     (exit))
-	   (set! db (sqlite3:open-database dbpath)))
-	  (if *db-write-access* (sqlite3:set-busy-handler! db handler))
+	   (set! db (dbi:open 'sqlite3 (cons (cons ('dbname dbpath) '()))))
+	  ;;(if *db-write-access* (sqlite3:set-busy-handler! db handler))
 	  (if (not dbexists)
 	      (begin
 		(datashare:initialize-db db)))
 	  db)
 	(print "ERROR: invalid path for storing database: " path))))
@@ -264,25 +266,25 @@
    (apply open-run-close-no-exception-handling proc idb params)))
 
 (define (open-run-close-no-exception-handling  proc idb . params)
   ;; (print "open-run-close-no-exception-handling START given a db=" (if idb "yes " "no ") ", params=" params)
   (let* ((db (cond
-	      ((sqlite3:database? idb)     idb)
+	      ((dbi:database? idb)     idb)
 	      ((not idb)                   (print "ERROR: cannot open-run-close with #f anymore"))
 	      ((procedure? idb)            (idb))
 	      (else                        (print "ERROR: cannot open-run-close with #f anymore"))))
 	 (res #f))
     (set! res (apply proc db params))
-    (if (not idb)(sqlite3:finalize! dbstruct))
+    (if (not idb)(dbi:close dbstruct))
     ;; (print "open-run-close-no-exception-handling END" )
     res))
 
 (define open-run-close open-run-close-no-exception-handling)
 
 (define (datashare:get-pkgs db area-filter version-filter iter-filter)
   (let ((res '()))
-    (sqlite3:for-each-row ;; replace with fold ...
+    (dbi:for-each-row ;; replace with fold ...
      (lambda (a . b)
        (set! res (cons (list->vector (cons a b)) res)))
      db 
      (conc "SELECT id,area,version_name,store_type,copied,source_path,iteration,submitter,datetime,storegrp,datavol,quality,disk_id,comment,stored_path "
 	   " FROM pkgs WHERE area like ? AND version_name LIKE ? AND iteration " iter-filter ";")
@@ -290,11 +292,11 @@
     (reverse res)))
 
 (define (datashare:get-pkg db area-name version-name #!key (iteration #f))
   (let ((dat '())
 	(res #f))
-    (sqlite3:for-each-row ;; replace with fold ...
+    (dbi:for-each-row ;; replace with fold ...
      (lambda (a . b)
        (set! dat (cons (list->vector (cons a b)) dat)))
      db 
      (conc "SELECT id,area,version_name,store_type,copied,source_path,iteration,submitter,datetime,storegrp,datavol,quality,disk_id,comment,stored_path "
 	   " FROM pkgs WHERE area=? AND version_name=? ORDER BY iteration ASC;")
@@ -313,11 +315,11 @@
 		    (loop (car tal)(cdr tal)))))))))
 
 (define (datashare:get-versions-for-area db area-name #!key (version-patt #f))
   (let ((res '())
 	(data (make-hash-table)))
-    (sqlite3:for-each-row
+    (dbi:for-each-row
      (lambda (version-name submitter iteration submitted-time comment)
        ;;                                              0           1         2           3           4
        (hash-table-set! data version-name (vector version-name submitter iteration submitted-time comment)))
      db 
      "SELECT version_name,submitter,iteration,datetime,comment FROM pkgs WHERE area='megatest' AND version_name != 'latest' AND version_name LIKE ? ORDER BY datetime asc;"
@@ -341,18 +343,18 @@
 	  (print "Running command: rsync -av " source-path "/ " targ-path "/")
 	  (let ((th1 (make-thread (lambda ()
 				    (let ((pid (process-run "rsync" (list "-av" (conc source-path "/") (conc targ-path "/")))))
 				      (process-wait pid)
 				      (datashare:set-copied db id "yes")
-				      (sqlite3:finalize! db)))
+				      (dbi:close db)))
 				   "Data copy")))
 	    (thread-start! th1))
 	  #t)
 	(begin
 	  (print "ERROR: Not enough space in storage area " dest-path)
 	  (datashare:set-copied db id "no")
-	  (sqlite3:finalize! db)
+	  (dbi:close db)
 	  #f))))
 
 (define (datashare:get-areas configdat)
   (let* ((areadat (configf:get-section configdat "areas"))
 	 (areas   (if areadat (map car areadat) '())))
@@ -377,11 +379,11 @@
 		(datashare:set-stored-path db id spath)
 		(datashare:set-copied db id "yes")
 		(datashare:set-copied db id "n/a")
 		(datashare:set-latest db id area-name version iteration)))
 	  (print "ERROR: Failed to get an iteration number"))
-      (sqlite3:finalize! db)
+      (dbi:close db)
       (cons #t "Successfully saved data")))))
 
 (define (datashare:get-best-storage configdat)
   (let* ((storage     (configf:lookup configdat "settings" "storage"))
 	 (store-areas (if storage (string-split storage) '())))
@@ -607,11 +609,11 @@
 					 (fullpath (conc basepath path)))
 				    (if (not (hash-table-ref/default installed-dat path #f))
 					(tree:add-node tb2 "Installed" (datashare:path->lst path)))
 				    (hash-table-set! installed-dat path (datashare:pathdat-apply-heuristics configdat fullpath))))
 				areas)
-			       (sqlite3:finalize! db))))
+			       (dbi:close db))))
 	   (apply          (iup:button "Apply"
 				       #:action
 				       (lambda (obj)
 					 (if curr-record
 					     (let* ((area        (datashare:pkg-get-area        curr-record))
@@ -739,11 +741,11 @@
 				     (else #f)))
 		      (dest-stub   (configf:lookup configdat "areas" area))
 		      (target-path (conc basepath "/" dest-stub)))
 		 (datashare:build-dir-make-link stored-path target-path)
 		 (datashare:record-pkg-ref db (datashare:pkg-get-id curr-record) target-path)
-		 (sqlite3:finalize! db)
+		 (dbi:close db)
 		 (print "Creating link from " stored-path " to " target-path))))))
     ((publish)
      (if (< (length args) 3)
 	 (begin 
 	   (print "ERROR: Missing arguments; " (string-intersperse args ", "))
@@ -781,11 +783,11 @@
 			  (vector-ref x 2) 
 			  (conc "\"" (time->string (seconds->local-time (vector-ref x 3))) "\"")
 			  (conc "\"" (vector-ref x 4) "\""))
 		  (print (vector-ref x 0))))
 	    versions)
-       (sqlite3:finalize! db)))))
+       (dbi:close db)))))
 
 ;; ease debugging by loading ~/.dashboardrc - REMOVE FROM PRODUCTION!
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.datasharerc")))
   (if (file-exists? debugcontrolf)
       (load debugcontrolf)))