Changeset 1005

Timestamp:

04/19/02 10:42:00 (11 years ago)

Author:

bradfitz

Message:

more lang/text work

Location:

trunk/bin/upgrading

Files:

• texttool.pl (modified) (3 diffs)
• update-db-general.pl (modified) (1 diff)

trunk/bin/upgrading/texttool.pl

@@ -29 +29 @@
   dumptext     Dump lang text based on text[-local].dat information
   check        Check validity of text[-local].dat files
+  wipedb       Remove all language/text data from database.
   newitems     Search files in htdocs, cgi-bin, & bin and insert
                necessary text item codes in database.
@@ -141 +142 @@
 popstruct() if $mode eq "dump";
 newitems() if $mode eq "newitems";
+wipedb() if $mode eq "wipedb";
 help();
+
+sub wipedb
+{
+    $dbh->do("DELETE FROM ml_$_")
+        foreach (qw(domains items langdomains langs latest text));
+    exit 0;                 
+}
 
 sub popstruct
@@ -166 +175 @@
 
     print "All done.\n";
+    exit 0;
+}
+
+sub poptext
+{
+    foreach my $lang (keys %lang_code)
+    {
+        print "$lang\n";
+        my $l = $lang_code{$lang};
+        open (D, "$ENV{'LJHOME'}/bin/upgrading/${lang}.dat")
+            or die "Can't find $lang.dat\n";
+        my $lnum = 0;
+        my ($code, $text);
+        while (my $line = <D>) {
+            $lnum++;
+            if ($line =~ /^(\S+?)=(.*)/) {
+                ($code, $text) = ($1, $2);
+            } elsif ($line =~ /^(\S+?)\<\<\s*$/) {
+                ($code, $text) = ($1, "");
+                while (<D>) {
+                    last if $_ eq ".\n";
+                    s/^\.//;
+                    $text .= $_;
+                }
+            } elsif ($line =~ /\S/) {
+                die "$lang.dat:$lnum: Bogus format.\n";
+            }
+
+            my $qcode = $dbh->quote($code);
+            my $exists = $dbh->selectrow_array("SELECT COUNT(*) FROM ml_latest l, ml_items i ".
+                                               "WHERE l.dmid=1 AND i.dmid AND i.itcode=$qcode AND ".
+                                               "i.itid=l.itid AND l.lnid=$l->{'lnid'}");
+            if (! $exists) {
+                print " adding: $code = ";
+                my $res = LJ::Lang::set_text($dbh, 1, $lang, $code, $text);
+                print "$res\n";
+            }
+        }
+        close D;
+    }
     exit 0;
 }

trunk/bin/upgrading/update-db-general.pl

@@ -1416 +1416 @@
    PRIMARY KEY (lnid, dmid, itid),
    chgtime  DATETIME NOT NULL,
-   txtid     INT UNSIGNED NOT NULL,
-   version   SMALLINT UNSIGNED NOT NULL,
+   staleness  TINYINT UNSIGNED DEFAULT 0 NOT NULL, # better than ENUM('0','1','2');
+   INDEX (lnid, staleness),
    INDEX (dmid, itid),
    INDEX (lnid, dmid, chgtime),