fedora-vote README, 1.3, 1.4 castvote.cgi, 1.14, 1.15 vote.cgi, 1.12, 1.13

[Toshio くらとみ (toshio)]

Author: toshio

Update of /cvs/fedora/fedora-vote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3191

Modified Files:
	README castvote.cgi vote.cgi 
Log Message:
Fix some syntax errors.



Index: README
===================================================================
RCS file: /cvs/fedora/fedora-vote/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README	4 Jul 2007 17:41:31 -0000	1.3
+++ README	21 Apr 2008 02:41:12 -0000	1.4
@@ -3,7 +3,7 @@
 ===================
 
 :Author: Toshio Kuratomi
-:Date: 13 Feb 2007
+:Date: 20 Apr 2008
 
 This is a bit more manual than I'd like it to be but it's not too hard.
 
@@ -35,7 +35,7 @@
    name but that's just because I'm anal :-)
 
 8) Run the script on a machine that has network access to
-   db1.fedora.phx.redhat.com, the fedora account system module checked out
+   db2.fedora.phx.redhat.com, the fedora account system module checked out
    somewhere with the website module, the pgdb module, and the
    /etc/sysconfig/fedora-db-access file (to enable the website module to work).
 
@@ -71,7 +71,7 @@
 There is currently no web interface to this.  You have to log in to the
 db and view the tallysheet::
 
-  psql -h db1.fedora.phx.redhat.com -U electionsuser elections
+  psql -h db2 -U electionsuser elections
   Password:
   elections=> select * from tallysheet where election_id = 2;
    vote_count |   id   | election_id 


Index: castvote.cgi
===================================================================
RCS file: /cvs/fedora/fedora-vote/castvote.cgi,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- castvote.cgi	21 Apr 2008 02:07:28 -0000	1.14
+++ castvote.cgi	21 Apr 2008 02:41:14 -0000	1.15
@@ -114,10 +114,10 @@
     except:
         content = 'Voting app is not configured.'
 
-    electionName = config.get('election_name', None)
-    fas_username = config.get('fas_username', None)
-    fas_password = config.get('fas_password', None)
-    fas_url = config.get('fas_url', None)
+    electionName = config.get('global', 'election_name', None)
+    fas_username = config.get('global', 'fas_username', None)
+    fas_password = config.get('global', 'fas_password', None)
+    fas_url = config.get('global', 'fas_url', None)
     if not (electionName and fas_username and fas_password and fas_url):
         content = 'One of the mandatory election variables was not configured'
 
@@ -126,7 +126,7 @@
         pageTitle, content = make_body(electionName, fas_url,
                 fas_username, fas_password)
     else:
-        pageTitle = 'Fedora Voting App -- Error Page')
+        pageTitle = 'Fedora Voting App -- Error Page'
 
     website.print_header(pageTitle, username)
 


Index: vote.cgi
===================================================================
RCS file: /cvs/fedora/fedora-vote/vote.cgi,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vote.cgi	21 Apr 2008 02:07:28 -0000	1.12
+++ vote.cgi	21 Apr 2008 02:41:14 -0000	1.13
@@ -137,10 +137,10 @@
     except:
         content = 'Voting app is not configured.'
 
-    electionName = config.get('election_name', None)
-    fas_username = config.get('fas_username', None)
-    fas_password = config.get('fas_password', None)
-    fas_url = config.get('fas_url', None)
+    electionName = config.get('global', 'election_name', None)
+    fas_username = config.get('global', 'fas_username', None)
+    fas_password = config.get('global', 'fas_password', None)
+    fas_url = config.get('global', 'fas_url', None)
     if not (electionName and fas_username and fas_password and fas_url):
         content = 'One of the mandatory election variables was not configured'
 
@@ -149,7 +149,7 @@
         pageTitle, content = make_body(electionName, fas_url,
                 fas_username, fas_password)
     else:
-        pageTitle = 'Fedora Voting App -- Error Page')
+        pageTitle = 'Fedora Voting App -- Error Page'
 
     website.print_header(pageTitle, username)
     print content