modify flibusta convert script

2 files changed, 15 insertions, 22 deletions

diff --git a/scripts/Flibusta/conv_book.php b/scripts/Flibusta/conv_book.php
index 7a27a65f..8178aa5c 100644
--- a/scripts/Flibusta/conv_book.php
+++ b/scripts/Flibusta/conv_book.php
@@ -222,6 +222,8 @@ function setup_params($sqlite_db, $date, $type)
   $sqlite_db->query("commit;");
 }
 
+require_once 'conv_info.php';
+
 function FullImport($mysql_db, $file, $date)
 {
   $sqlite_db = new PDO('sqlite:./'.$file);
@@ -238,7 +240,12 @@ function FullImport($mysql_db, $file, $date)
   
   create_indexes($sqlite_db);
 
-  system("zip $file.zip $file");
+  system("zip flibusta.zip $file");
+
+  author_info($mysql_db, $sqlite_db, 0);
+  book_info($mysql_db, $sqlite_db, 0);
+
+  system("zip flibusta.full.zip $file");
 }
 
 function DeltaImport($mysql_db, $date)
@@ -264,6 +271,9 @@ function DeltaImport($mysql_db, $date)
 	convert_genres($mysql_db, $sqlite_db, $row['bid']);
 	convert_dates($mysql_db, $sqlite_db, $row['bid']);
 
+	author_info($mysql_db, $sqlite_db, $row['aid']);
+	book_info($mysql_db, $sqlite_db, $row['bid']);
+
 	system("zip $file.zip $file");
   }
   
diff --git a/scripts/Flibusta/conv_info.php b/scripts/Flibusta/conv_info.php
index efe041b5..ba5344e7 100644
--- a/scripts/Flibusta/conv_info.php
+++ b/scripts/Flibusta/conv_info.php
@@ -2,13 +2,11 @@
 
 require_once 'bbcode/bbcode.lib.php';
 
-function author_info($mysql_db, $sqlite_db)
+function author_info($mysql_db, $sqlite_db, $min)
 {
-  
-
   $bb = new bbcode;
   $bb->autolinks = false;
-  $sqltest = "SELECT AvtorId FROM libaannotations";
+  $sqltest = "SELECT AvtorId FROM libaannotations WHERE AvtorId<$min";
   $query = $mysql_db->query($sqltest);
   while ($row = $query->fetch_array()) {
     echo "Auth: ".$row['AvtorId']."\n";
@@ -30,11 +28,11 @@ function author_info($mysql_db, $sqlite_db)
   $sqlite_db->query("commit;");
 }
 
-function book_info($mysql_db, $sqlite_db)
+function book_info($mysql_db, $sqlite_db, $min)
 {
   $bb = new bbcode;
   $bb->autolinks = false;
-  $sqltest = "SELECT BookId FROM libbannotations";
+  $sqltest = "SELECT BookId FROM libbannotations WHERE BookId<$min";
   $query = $mysql_db->query($sqltest);
   while ($row = $query->fetch_array()) {
     echo "Book: ".$row['BookId']."\n";
@@ -56,19 +54,4 @@ function book_info($mysql_db, $sqlite_db)
   $sqlite_db->query("commit;");
 }
 
-$mysql_srvr = 'localhost';
-$mysql_user = 'root';
-$mysql_pass = '';
-$mysql_base = 'flibusta';
-$sqlitefile = './myrulib.db';
-
-include('settings.php');
-
-$sqlite_db = new PDO('sqlite:'.$sqlitefile);
-$mysql_db = new mysqli($mysql_srvr, $mysql_user, $mysql_pass, $mysql_base);
-$mysql_db->query("SET NAMES utf8");
-
-author_info($mysql_db, $sqlite_db);
-book_info($mysql_db, $sqlite_db);
-
 ?>