Changeset 44 for Dev/trunk/classes

Timestamp:

07/25/11 14:44:24 (14 years ago)

Author:

basvannuland

Message:

added login functionality. Has not been styled

Location:

Dev/trunk/classes

Files:

• SurveyDatabaseInterface.php (modified) (1 diff)
• SurveyRDFReader.php (modified) (2 diffs)
• SurveyRDFWriter.php (modified) (1 diff)
• UserDatabaseInterface.php (added)
• UserRDFReader.php (modified) (2 diffs)
• UserRDFWriter.php (modified) (2 diffs)

Dev/trunk/classes/SurveyDatabaseInterface.php

@@ -1 +1 @@
 <?php
 // Survey database interface class as intermediate for storing data from the site to the RDF database 
-require 'rdfConstants.php';
+require_once 'rdfConstants.php';
 
 // Include RAP Library to write RDF files
-define("RDFAPI_INCLUDE_DIR", "rdfapi/");
 include(RDFAPI_INCLUDE_DIR . "RDFAPI.php");
 

Dev/trunk/classes/SurveyRDFReader.php

@@ -130 +130 @@
         }
         
-        public function readSurveyAnswers($qID)
+        public function readSurveyAnswers($questionID)
         {
                 $querystring = '
@@ -139 +139 @@
                         {
                                 _question               predicates:resource_type        resources:question ;
-                                                                predicates:uid                          "' . $qID . '"  ;
+                                                                predicates:uid                          "' . $questionID . '"  ;
                                                                 predicates:has_answer           _answer .
                                 _answer                 predicates:title                        ?answerTitle                                                            

Dev/trunk/classes/SurveyRDFWriter.php

@@ -54 +54 @@
         public function setApplicationData($applicationID)
         {
-                $resourceApplication = new Resource(APPLICATION . '/' . $userID);
+                $resourceApplication = new Resource(APPLICATION . '/' . $applicationID);
                                 
                 $predicatePartOf = new Resource(PART_OF);

Dev/trunk/classes/UserRDFReader.php

@@ -17 +17 @@
     }
         
-        public function readUserInfo($userID)
+        public function getUserNames()
         {
                 $querystring = '
@@ -26 +26 @@
                         {
                                 _user           predicates:resource_type        resources:user ;
-                                                        predicates:uid                          "' . $userID . '"       ;
                                                         predicates:name                         ?name   
+                        }';
+                        
+                $result = $this->model->sparqlQuery($querystring);
+                                
+                return $result;
+        }
+        
+        public function getUserPassword($userName)
+        {
+                $querystring = '
+                        PREFIX  predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
+                        PREFIX  resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
+                        SELECT  ?password 
+                        WHERE   
+                        {
+                                _user           predicates:resource_type        resources:user ;
+                                                        predicates:name                         "' . $userName . '"     ;
+                                                        predicates:password                     ?password
                         }';
                         

Dev/trunk/classes/UserRDFWriter.php

@@ -22 +22 @@
         }
         
-        public function addNewUser($name)
+        public function addNewUser($name,$password)
         {
                 $userID = md5( uniqid(rand(), true) );
@@ -32 +32 @@
                 $this->model->add(new Statement($resourceUser,$predicateRType,$resourceUserType));
                 
+                $literalUserName = new Literal($name);
+                $predicateName = new Resource(NAME);
+                $this->model->add(new Statement($resourceUser,$predicateName,$literalUserName));        
+                
                 $literalUserID = new Literal($userID);
                 $predicateUniqueID = new Resource(UID);
                 $this->model->add(new Statement($resourceUser,$predicateUniqueID,$literalUserID));              
+                
+                $literalPassword = new Literal($password);
+                $predicatePassword = new Resource(PASSWORD);
+                $this->model->add(new Statement($resourceUser,$predicatePassword,$literalPassword));    
         }