summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreric <eric>2004-06-28 10:39:12 +0000
committereric <eric>2004-06-28 10:39:12 +0000
commitefcca46f26247ee69b33cb1effb0d34077817a80 (patch)
tree94ac2b265ff8ed77847a4979744d4f66a511f9a6
parentdc3b13064cdb59dd12b200e7f8c73fd63126dea6 (diff)
downloadaurweb-efcca46f26247ee69b33cb1effb0d34077817a80.tar.xz
working on action box for packages
-rw-r--r--support/schema/dummy-data.sql.gzbin78294 -> 77962 bytes
-rwxr-xr-xsupport/schema/gendummydata.py76
-rw-r--r--web/lang/pkgs_po.inc25
-rw-r--r--web/lib/aur.inc5
-rw-r--r--web/lib/pkgs.inc35
5 files changed, 86 insertions, 55 deletions
diff --git a/support/schema/dummy-data.sql.gz b/support/schema/dummy-data.sql.gz
index 1a2e8e8..296b8aa 100644
--- a/support/schema/dummy-data.sql.gz
+++ b/support/schema/dummy-data.sql.gz
Binary files differ
diff --git a/support/schema/gendummydata.py b/support/schema/gendummydata.py
index 8dfc61f..06513ef 100755
--- a/support/schema/gendummydata.py
+++ b/support/schema/gendummydata.py
@@ -15,10 +15,10 @@ DB_USER = "aur"
DB_PASS = "aur"
USER_ID = 5 # Users.ID of first user
PKG_ID = 1 # Packages.ID of first package
-MAX_USERS = 100 # how many users to 'register'
+MAX_USERS = 200 # how many users to 'register'
MAX_DEVS = .1 # what percentage of MAX_USERS are Developers
MAX_TUS = .2 # what percentage of MAX_USERS are Trusted Users
-MAX_PKGS = 250 # how many packages to load
+MAX_PKGS = 2500 # how many packages to load
PKG_FILES = (8, 30) # min/max number of files in a package
VOTING = (.3, .8) # percentage range for package voting
RANDOM_PATHS = [ # random path locations for package files
@@ -78,13 +78,16 @@ user_keys = []
# some functions to generate random data
#
-def genVersion():
- major = random.randrange(0,10)
- minor = random.randrange(0,20)
+def genVersion(location_id=0):
+ ver = []
+ ver.append("%d" % random.randrange(0,10))
+ ver.append("%d" % random.randrange(0,20))
if random.randrange(0,2) == 0:
- revision = random.randrange(0,100)
- return "%d.%d.%d" % (major, minor, revision)
- return "%d.%d" % (major, minor)
+ ver.append("%d" % random.randrange(0,100))
+ if location_id == 2: # the package is in the AUR
+ return ".".join(ver) + "-u%d" % random.randrange(1,11)
+ else:
+ return ".".join(ver) + "%d" % random.randrange(1,11)
def genCategory():
return categories[category_keys[random.randrange(0,len(category_keys))]]
def genLocation():
@@ -194,10 +197,7 @@ for u in user_keys:
#
pass
- s = """\
-INSERT INTO Users (ID, AccountTypeID, Username, Email, Passwd)
- VALUES (%d, %d, '%s', '%s@example.com', '%s');
- """ % (seen_users[u], account_type, u, u, u)
+ s = "INSERT INTO Users (ID, AccountTypeID, Username, Email, Passwd) VALUES (%d, %d, '%s', '%s@example.com', '%s');\n" % (seen_users[u], account_type, u, u, u)
out.write(s)
if count % 10 == 0:
if DBUG: print ".",
@@ -225,12 +225,8 @@ for p in seen_pkgs.keys():
if location_id == 1: # unsupported pkgs don't have a maintainer
muid = 0
- s = """\
-INSERT INTO Packages (ID, Name, Version, CategoryID, LocationID,
- SubmittedTS, SubmitterUID, MaintainerUID)
- VALUES (%d, '%s', '%s', %d, %d, %d, %d, %d);
- """ % (seen_pkgs[p], p, genVersion(), genCategory(), location_id,
- long(time.time()), genUID(), muid)
+ s = "INSERT INTO Packages (ID, Name, Version, CategoryID, LocationID, SubmittedTS, SubmitterUID, MaintainerUID) VALUES (%d, '%s', '%s', %d, %d, %d, %d, %d);\n" % (seen_pkgs[p], p, genVersion(location_id), genCategory(),
+ location_id, long(time.time()), genUID(), muid)
out.write(s)
if count % 100 == 0:
if DBUG: print ".",
@@ -238,56 +234,35 @@ INSERT INTO Packages (ID, Name, Version, CategoryID, LocationID,
if location_id == 1: # Unsupported - just a PKGBUILD and maybe other stuff
others = random.randrange(0,3)
- s = """\
-INSERT INTO PackageContents (PackageID, FileName, Path, FileSize)
- VALUES (%d, '%s', '%s', %d);
- """ % (seen_pkgs[p], "PKGBUILD", "/home/aur/incoming/%s/PKGBUILD" % p,
+ s = "INSERT INTO PackageContents (PackageID, FileName, Path, FileSize) VALUES (%d, '%s', '%s', %d);\n" % (seen_pkgs[p], "PKGBUILD", "/home/aur/incoming/%s/PKGBUILD" % p,
random.randrange(0,999))
out.write(s)
if others == 0:
- s = """\
-INSERT INTO PackageContents (PackageID, FileName, Path, FileSize)
- VALUES (%d, '%s', '%s', %d);
- """ % (seen_pkgs[p], "%s.patch" % p,
+ s = "INSERT INTO PackageContents (PackageID, FileName, Path, FileSize) VALUES (%d, '%s', '%s', %d);\n" % (seen_pkgs[p], "%s.patch" % p,
"/home/aur/incoming/%s/%s.patch" % (p,p),
random.randrange(0,999))
out.write(s)
elif others == 1:
- s = """\
-INSERT INTO PackageContents (PackageID, FileName, Path, FileSize)
- VALUES (%d, '%s', '%s', %d);
- """ % (seen_pkgs[p], "%s.patch" % p,
+ s = "INSERT INTO PackageContents (PackageID, FileName, Path, FileSize) VALUES (%d, '%s', '%s', %d);\n" % (seen_pkgs[p], "%s.patch" % p,
"/home/aur/incoming/%s/%s.patch" % (p,p),
random.randrange(0,999))
out.write(s)
- s = """\
-INSERT INTO PackageContents (PackageID, FileName, Path, FileSize)
- VALUES (%d, '%s', '%s', %d);
- """ % (seen_pkgs[p], "arch.patch",
+ s = "INSERT INTO PackageContents (PackageID, FileName, Path, FileSize) VALUES (%d, '%s', '%s', %d);\n" % (seen_pkgs[p], "arch.patch",
"/home/aur/incoming/%s/arch.patch" % p,
random.randrange(0,999))
out.write(s)
elif others == 2:
- s = """\
-INSERT INTO PackageContents (PackageID, FileName, Path, FileSize)
- VALUES (%d, '%s', '%s', %d);
- """ % (seen_pkgs[p], "%s.patch" % p,
+ s = "INSERT INTO PackageContents (PackageID, FileName, Path, FileSize) VALUES (%d, '%s', '%s', %d);\n" % (seen_pkgs[p], "%s.patch" % p,
"/home/aur/incoming/%s/%s.patch" % (p,p),
random.randrange(0,999))
out.write(s)
- s = """\
-INSERT INTO PackageContents (PackageID, FileName, Path, FileSize)
- VALUES (%d, '%s', '%s', %d);
- """ % (seen_pkgs[p], "arch.patch",
+ s = "INSERT INTO PackageContents (PackageID, FileName, Path, FileSize) VALUES (%d, '%s', '%s', %d);\n" % (seen_pkgs[p], "arch.patch",
"/home/aur/incoming/%s/arch.patch" % p,
random.randrange(0,999))
out.write(s)
- s = """\
-INSERT INTO PackageContents (PackageID, FileName, Path, FileSize)
- VALUES (%d, '%s', '%s', %d);
- """ % (seen_pkgs[p], "%s.install" % p,
+ s = "INSERT INTO PackageContents (PackageID, FileName, Path, FileSize) VALUES (%d, '%s', '%s', %d);\n" % (seen_pkgs[p], "%s.install" % p,
"/home/aur/incoming/%s/%s.install" % (p,p),
random.randrange(0,999))
out.write(s)
@@ -317,10 +292,7 @@ INSERT INTO PackageContents (PackageID, FileName, Path, FileSize)
path = loc + "/" + p
if not files.has_key(path):
files[path] = 1
- s = """\
-INSERT INTO PackageContents (PackageID, FileName, Path, FileSize)
- VALUES (%d, '%s', '%s', %d);
- """ % (seen_pkgs[p], os.path.basename(path), path,
+ s = "INSERT INTO PackageContents (PackageID, FileName, Path, FileSize) VALUES (%d, '%s', '%s', %d);\n" % (seen_pkgs[p], os.path.basename(path), path,
random.randrange(0,99999999))
out.write(s)
if DBUG: print "."
@@ -336,9 +308,7 @@ for u in user_keys:
for v in range(num_votes):
pkg = random.randrange(0, len(seen_pkgs))
if not pkgvote.has_key(pkg):
- s = """\
-INSERT INTO PackageVotes (UsersID, PackageID) VALUES (%d, %d);
- """ % (seen_users[u], pkg)
+ s = "INSERT INTO PackageVotes (UsersID, PackageID) VALUES (%d, %d);\n" % (seen_users[u], pkg)
pkgvote[pkg] = 1
out.write(s)
if count % 100 == 0:
diff --git a/web/lang/pkgs_po.inc b/web/lang/pkgs_po.inc
index 20acf85..cd96ecb 100644
--- a/web/lang/pkgs_po.inc
+++ b/web/lang/pkgs_po.inc
@@ -91,4 +91,29 @@ $_t["en"]["Out-of-date"] = "Out-of-date";
# $_t["fr"]["Out-of-date"] = "--> Traduction française ici. <--";
# $_t["de"]["Out-of-date"] = "--> Deutsche Übersetzung hier. <--";
+$_t["en"]["Flag Out-of-date"] = "Flag Out-of-date";
+# $_t["es"]["Flag Out-of-date"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Flag Out-of-date"] = "--> Traduction française ici. <--";
+# $_t["de"]["Flag Out-of-date"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Actions"] = "Actions";
+# $_t["es"]["Actions"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Actions"] = "--> Traduction française ici. <--";
+# $_t["de"]["Actions"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Adopt Packages"] = "Adopt Packages";
+# $_t["es"]["Adopt Packages"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Adopt Packages"] = "--> Traduction française ici. <--";
+# $_t["de"]["Adopt Packages"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Disown Packages"] = "Disown Packages";
+# $_t["es"]["Disown Packages"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Disown Packages"] = "--> Traduction française ici. <--";
+# $_t["de"]["Disown Packages"] = "--> Deutsche Übersetzung hier. <--";
+
+$_t["en"]["Vote"] = "Vote";
+# $_t["es"]["Vote"] = "--> Traducción española aquí. <--";
+# $_t["fr"]["Vote"] = "--> Traduction française ici. <--";
+# $_t["de"]["Vote"] = "--> Deutsche Übersetzung hier. <--";
+
?> \ No newline at end of file
diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index 9407a40..fd923c7 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -406,13 +406,14 @@ function html_footer($ver="") {
print " </td>\n";
print " </tr>\n";
print "</table>\n";
- print "<p>\n";
if ($ver) {
+ print "<p>\n";
print "<table border='0' cellpadding='0' cellspacing='0' width='97%'>\n";
print "<tr><td align='right'><span class='fix'>".$ver."</span></td></tr>\n";
print "</table>\n";
+ print "</p>\n";
}
- print "</p>\n";
+ print "<br />\n";
print "</body>\n</html>";
return;
}
diff --git a/web/lib/pkgs.inc b/web/lib/pkgs.inc
index dfcebb9..b4c4788 100644
--- a/web/lib/pkgs.inc
+++ b/web/lib/pkgs.inc
@@ -181,6 +181,41 @@ function pkg_search_page($SID="",$L="",$C="",$K="",$SB="",$M=0,$O=0,$PP=25) {
# name will be a link that goes to 'details'. There should also be
# a column for 'manage/edit'
+ if ($SID) {
+ print "<center>\n";
+ print "<form action='/pkgsearch.php' method='post'>\n";
+ print "<table cellspacing='3' class='boxSoft'>\n";
+ print "<tr>\n";
+ print " <td class='boxSoftTitle' align='right'>\n";
+ print " <span class='f3'>".__("Actions")."</span>\n";
+ print " </td>\n";
+ print "</tr>\n";
+ print "<tr>\n";
+ print " <td class='boxSoft'>\n";
+ print "<input type='hidden' name='Action' value='DoSomething'>\n";
+ print "<table style='width: 100%' align='center'>\n";
+ print "<tr>\n";
+ print " <td align='center'>";
+ print "<input type='submit' class='button' name='do_Flag'";
+ print " value='".__("Flag Out-of-date")."'></td>\n";
+ print " <td align='center'>";
+ print "<input type='submit' class='button' name='do_Disown'";
+ print " value='".__("Disown Packages")."'></td>\n";
+ print " <td align='center'>";
+ print "<input type='submit' class='button' name='do_Adopt'";
+ print " value='".__("Adopt Packages")."'></td>\n";
+ print " <td align='center'>";
+ print "<input type='submit' class='button' name='do_Vote'";
+ print " value='".__("Vote")."'></td>\n";
+ print "</tr>\n";
+ print "</table>\n";
+ print " </td>\n";
+ print "</tr>\n";
+ print "</table>\n";
+ print "</form>\n";
+ print "</center>\n";
+ print "<br />\n";
+ }
# query to pull out package info
#