Changeset 252 for Dev/branches/jQueryUI/server/classes/models

Timestamp:

02/10/12 15:25:42 (13 years ago)

Author:

jkraaijeveld

Message:

Ticket #5: Added emails to users and respondents. This replaces the original 'name' field.

Location:

Dev/branches/jQueryUI/server/classes/models

Files:

• ResearchToolObject.php (modified) (1 diff)
• Respondent.php (modified) (6 diffs)
• ResultSet.php (modified) (1 diff)
• User.php (modified) (7 diffs)

Dev/branches/jQueryUI/server/classes/models/ResearchToolObject.php

@@ -55 +55 @@
                                 case "category" : $addition = "predicates:question_category '" . $arguments[$key] . "'\n";
                                 case "definedanswers" : foreach($arguments[$key] as $answer) { $addition = $addition . "predicates:has_answer '" . $answer . "'\n"; } break;
-                                case "name" : $addition = "predicates:name '" . $arguments[$key] . "'\n"; break;
+                                case "email" : $addition = "predicates:email '" . $arguments[$key] . "'\n"; break;
                                 case "password" : $addition = "predicates:password '" . $arguments[$key] . "'\n"; break;
                                 case "creator" : $addition = "predicates:creator '" . $arguments[$key] . "'\n"; break;

Dev/branches/jQueryUI/server/classes/models/Respondent.php

@@ -15 +15 @@
         private static $filename = 'data/users/respondents.rdf';
 
-        public $name;
+        public $email;
         public $password;
 
@@ -21 +21 @@
          * Constructor for a Respondent object
          * @param type $uid
-         * @param type $name
+         * @param type $email
          * @param type password
          */
-        public function __construct($uid = null, $name = null, $password = null)
+        public function __construct($uid = null, $email = null, $password = null)
         {
         if(!isset($uid))
@@ -32 +32 @@
       
         $this->uid = $uid;
-        $this->name = $name;
+        $this->email = $email;
         $this->password = $password;
         }
@@ -60 +60 @@
         $model->add(new Statement($resourceRespondent,$predicateUniqueID,$literalRespondentID));
         
-        $literalRespondentName = new Literal($this->name);
-        $predicateName = new Resource(NAME);
+        $literalRespondentName = new Literal($this->email);
+        $predicateName = new Resource(EMAIL);
         $model->add(new Statement($resourceRespondent,$predicateName,$literalRespondentName));                  
 
@@ -85 +85 @@
             PREFIX  predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
             PREFIX  resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-            SELECT ?uid, ?name, ?password
+            SELECT ?uid, ?email, ?password
             WHERE       
             {
                     _respondent predicates:resource_type        resources:respondent ;
                                         predicates:uid ?uid ;
-                                        predicates:name ?name ;
+                                        predicates:email ?email ;
                                         predicates:password ?password ;
                                         ' . ResearchToolObject::createArguments($arguments) .  '
@@ -102 +102 @@
             foreach($results as $result)
             { 
-                    $respondents[] = new Respondent($result['?uid']->label, $result['?name']->label, $result['?password']->label);
+                    $respondents[] = new Respondent($result['?uid']->label, $result['?email']->label, $result['?password']->label);
             }
         }

Dev/branches/jQueryUI/server/classes/models/ResultSet.php

@@ -157 +157 @@
                 return $answersets;
         }
-
-
-
 }

Dev/branches/jQueryUI/server/classes/models/User.php

@@ -16 +16 @@
         private static $filename = 'data/users/users.rdf';
     
-    public $name;
+    public $email;
     public $password;
     
@@ -23 +23 @@
      * If the user does not yet exist in the database, call with null as first parameter
      */
-    public function __construct($uid = null, $name = null, $password = null) {
+    public function __construct($uid = null, $email = null, $password = null) {
         if(!isset($uid))
         {
@@ -29 +29 @@
         }
         $this->uid = $uid;
-        $this->name = $name;
+                $this->email = $email;
         $this->password = $password;
         }
@@ -56 +56 @@
         $model->add(new Statement($resourceUser,$predicateUniqueID,$literalUserID));
         
-        $literalUserName = new Literal($this->name);
-        $predicateName = new Resource(NAME);
+        $literalUserName = new Literal($this->email);
+        $predicateName = new Resource(EMAIL);
         $model->add(new Statement($resourceUser,$predicateName,$literalUserName));                      
 
@@ -73 +73 @@
          * Gets the array of User objects belonging to arguments supplied.
          * @param type $arguments : An array containing zero or more of the following keys:
-         *                                                      'uid', 'name', 'password'
+         *                                                      'uid', 'email', 'password'
          */
         public static function get($arguments)
@@ -82 +82 @@
             PREFIX  predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
             PREFIX  resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-            SELECT ?uid, ?name, ?password
+            SELECT ?uid, ?email, ?password
             WHERE       
             {
                     _user       predicates:resource_type        resources:user ;
                                         predicates:uid ?uid ;
-                                        predicates:name ?name ;
+                                        predicates:email ?email ;
                                         predicates:password ?password ;
                                         ' . ResearchToolObject::createArguments($arguments) . '
@@ -99 +99 @@
             foreach($results as $result)
             { 
-                    $users[] = new User($result['?uid']->label, $result['?name']->label, $result['?password']->label);
+                                $users[] = new User($result['?uid']->label, $result['?email']->label, $result['?password']->label);
             }
         }
         return $users;
         }
-        
-        
 }