Index: /trunk/ippMonitor/dbadmin
===================================================================
--- /trunk/ippMonitor/dbadmin	(revision 11798)
+++ /trunk/ippMonitor/dbadmin	(revision 11799)
@@ -11,8 +11,9 @@
 
   mysql -h $dbserver -u root -p <<EOF
-create database ippadmin;
-create table users (username char(20) not null, password varchar(255));
-create table cookies (username char(20) not null, cookie varchar(255));
-grant all on *.* to $dbuser@localhost identified by '$dbpass';
+  create database ippadmin;
+  create table users (username char(20) not null, password varchar(255));
+  create table cookies (username char(20) not null, cookie varchar(255));
+  create table projects (projname char(20) not null);
+  grant all on *.* to $dbuser@localhost identified by '$dbpass';
 EOF
     exit 0;
@@ -21,8 +22,8 @@
 if ("$1" == "client") then
   if ($#argv != 5) goto usage;
-  set client = $2
-  set dbserver = $3
-  set dbuser = $4
-  set dbpass = $5
+  set dbserver = $2
+  set dbuser = $3
+  set dbpass = $4
+  set client = $5
 
   mysql -h $dbserver -u root -p <<EOF
@@ -34,8 +35,8 @@
 if ("$1" == "user") then
   if ($#argv != 5) goto usage;
-  set user = $2
-  set pass = $3
-  set dbserver = $4
-  set dbuser = $5
+  set dbserver = $2
+  set dbuser = $3
+  set user = $4
+  set pass = $5
 
   mysql -h $dbserver -u $dbuser -p ippadmin <<EOF
@@ -45,11 +46,12 @@
 endif
 
-if ("$1" == "db") then
+if ("$1" == "project") then
   if ($#argv != 4) goto usage;
-  set dbname = $2
-  set dbserver = $3
-  set dbuser = $4
+  set dbserver = $2
+  set dbuser = $3
+  set dbname = $4
 
-  mysql -h $dbserver -u $dbuser -p <<EOF
+  mysql -h $dbserver -u $dbuser -p ippadmin <<EOF
+   insert into projects (projname) values ('$dbname');
    create database $dbname;
 EOF
@@ -59,11 +61,16 @@
 usage:
   echo "USAGE: dbadmin (options)"
+  echo ""
   echo "  dbadmin init (dbserver) (dbuser) (dbpassword)"
-  echo "    creates admin tables, basic db user -- requires root password"
-  echo "  dbadmin client (client) (dbserver) (dbuser) (dbpassword)"
-  echo "    add client name or regex"
-  echo "  dbadmin db (dbname) (dbserver) (dbuser)"
-  echo "    create a new ipp database (project)"
-  echo "  dbadmin user (username) (password) (dbserver) (dbuser)"
-  echo "    create a new www user and password"
+  echo "      creates admin tables, basic db user -- requires root password"
+  echo ""
+  echo "  dbadmin client (dbserver) (dbuser) (dbpassword) (client)"
+  echo "      add client name or regex"
+  echo ""
+  echo "  dbadmin user (dbserver) (dbuser) (username) (password)"
+  echo "      create a new www user and password"
+  echo ""
+  echo "  dbadmin project (dbserver) (dbuser) (dbname)"
+  echo "      create a new ipp project (database)"
+  echo ""
   exit 2