Changeset 400

Timestamp:

05/09/06 19:21:16 (3 years ago)

Author:

stefan

Message:

Minor progress on tags:

• implemented a "urlify_tag" function that currently just calls rawurlencode()
• implemented unit tests for that function and added a few tests for the parse_tags function.
• whitespace changes (replacing tabs for spaces).

Location:

branches/plogger-with-tags

Files:

• plog-tag-functions.php (modified) (2 diffs)
• unittests/tag-tests.php (modified) (2 diffs)

branches/plogger-with-tags/plog-tag-functions.php

@@ -2 +2 @@
 
 function parse_tags($str) {
-        // 1. compress all extra whitespaces
-        $str = preg_replace('/\s{2,}/',' ',$str);
-        // 2. extract any phrases in quotes
-        preg_match_all('/(\'|")(.*?)(\1)/',$str,$phrases);
-        // 3. now remove the phrases from the string
-        $str = preg_replace('/(\'|")(.*?)(\1)/','',$str);
-        // 4. get rid of whitespaces at the end that may have been left
-        $str = trim($str);
-        // 5. get single words
-        $words = preg_split('/\s+/',$str);
-        // 6. merge single words and phrases
-        $tags = array_merge($phrases[2],$words);
+   // 1. compress all extra whitespaces
+   $str = preg_replace('/\Ts{2,}/',' ',$str);
+   // 2. extract any phrases in quotes
+   preg_match_all('/(\'|")(.*?)(\1)/',$str,$phrases);
+   // 3. now remove the phrases from the string
+   $str = preg_replace('/(\'|")(.*?)(\1)/','',$str);
+   // 4. get rid of whitespaces at the end that may have been left
+   $str = trim($str);
+   // 5. get single words
+   $words = preg_split('/\s+/',$str);
+   // 6. merge single words and phrases
+   $tags = array_merge($phrases[2],$words);
 
-        return $tags;
+   return $tags;
 }
 
 function urlify_tag($tag) {
    // 1. format the incoming tag to use in a URL
+   return rawurlencode($tag);
 }
 
 function get_picture_tags($picture_id) {
-        global $config;
-        global $TABLE_PREFIX;
-        $picture_id = intval($picture_id);
-        $picture_tags = array();
+   global $config;
+   global $TABLE_PREFIX;
+   $picture_id = intval($picture_id);
+   $picture_tags = array();
 
-        $query = 'SELECT `t2p`.`tag_id`, `t`.`path` FROM `'.$TABLE_PREFIX.'tag2picture` as `t2p`, `'.$TABLE_PREFIX.'tags` as `t` WHERE `picture_id` = '.$picture_id.' AND `t2p`.`tag_id` = `t`.`id`;';
-        $result = mysql_query($query);
-        while($tag_row = mysql_fetch_assoc($result)) {
-                $picture_tags[$tag_row['urlified']] = $tag_row['tag_id'];
-        };
-        return $picture_tags;
+   $query = 'SELECT `t2p`.`tag_id`, `t`.`path` FROM `'.$TABLE_PREFIX.'tag2picture` as `t2p`, `'.$TABLE_PREFIX.'tags` as `t` WHERE `picture_id` = '.$picture_id.' AND `t2p`.`tag_id` = `t`.`id`;';
+   $result = mysql_query($query);
+   while($tag_row = mysql_fetch_assoc($result)) {
+      $picture_tags[$tag_row['urlified']] = $tag_row['tag_id'];
+   };
+   return $picture_tags;
 }
 
-function get_popular_tags($count_limit) {
-   // Return a list of the $count_limit most popular tags
+function get_popular_tags($limit) {
+   // Return a list of the $limit most popular tags
 }
 
@@ -61 +62 @@
 
 function update_picture_tags($picture_id,$tags) {
-        global $config;
-        global $TABLE_PREFIX;
-        $tags = parse_tags(SmartStripSlashes($tags));
-        $picture_id = intval($picture_id);
+   global $config;
+   global $TABLE_PREFIX;
+   $tags = parse_tags(SmartStripSlashes($tags));
+   $picture_id = intval($picture_id);
 
-        /* process any tags for the picture */
-        $existing_tags = $existing_rels = array();
-        if (sizeof($tags) > 0) {
-                $tagsql = join('","',$tags);
-                $sql = 'SELECT * FROM '.$TABLE_PREFIX.'tags WHERE `tag` IN ("'.$tagsql.'")';
-                $result = mysql_query($sql);
-                while($tag_row = mysql_fetch_assoc($result)) {
-                        $existing_tags[$tag_row['tag']] = $tag_row['id'];
-                };
+   /* process any tags for the picture */
+   $existing_tags = $existing_rels = array();
+   if (sizeof($tags) > 0) {
+      $tagsql = join('","',$tags);
+      $sql = 'SELECT * FROM '.$TABLE_PREFIX.'tags WHERE `tag` IN ("'.$tagsql.'")';
+      $result = mysql_query($sql);
+      while($tag_row = mysql_fetch_assoc($result)) {
+         $existing_tags[$tag_row['tag']] = $tag_row['id'];
+      };
 
-                $sql = 'SELECT * FROM '.$TABLE_PREFIX.'tag2picture WHERE `picture_id` ="'.$picture_id.'"';
-                $result = mysql_query($sql);
-                while($tag_row = mysql_fetch_assoc($result)) {
-                        $existing_rels[$tag_row['tag_id']] = $tag_row['picture_id'];
-                };
-        };
+      $sql = 'SELECT * FROM '.$TABLE_PREFIX.'tag2picture WHERE `picture_id` ="'.$picture_id.'"';
+      $result = mysql_query($sql);
+      while($tag_row = mysql_fetch_assoc($result)) {
+         $existing_rels[$tag_row['tag_id']] = $tag_row['picture_id'];
+      };
+   };
 
-        foreach($tags as $tag) {
-                if (!isset($existing_tags[$tag])) {
-                        // must be a new tag, register it
-                        $path = mysql_real_escape_string(preg_replace("/[^\w|\.|'|\-|\[|\]]/","_",$tag));
-                        $sql = 'INSERT INTO '.$TABLE_PREFIX.'tags (`tag`,`tagdate`,`path`)
-                                        VALUES ("'.mysql_real_escape_string($tag).'","'.$path.'",NOW())';
-                        print $sql;
-                        $result = mysql_query($sql);
-                        $existing_tags[$tag] = mysql_insert_id();
-                };
+   foreach($tags as $tag) {
+      if (!isset($existing_tags[$tag])) {
+         // must be a new tag, register it
+         $path = mysql_real_escape_string(preg_replace("/[^\w|\.|'|\-|\[|\]]/","_",$tag));
+         $sql = 'INSERT INTO '.$TABLE_PREFIX.'tags (`tag`,`tagdate`,`path`)
+               VALUES ("'.mysql_real_escape_string($tag).'","'.$path.'",NOW())';
+         print $sql;
+         $result = mysql_query($sql);
+         $existing_tags[$tag] = mysql_insert_id();
+      };
 
-                if (!isset($existing_rels[$existing_tags[$tag]])) {
-                        // no connection between tag and picture? create if
-                        $sql = 'INSERT INTO '.$TABLE_PREFIX.'tag2picture (`picture_id`,`tag_id`,`tagdate`)
-                                        VALUES ("'.$picture_id.'","'.$existing_tags[$tag].'",NOW())';
-                        mysql_query($sql);
-                };
-        }
+      if (!isset($existing_rels[$existing_tags[$tag]])) {
+         // no connection between tag and picture? create if
+         $sql = 'INSERT INTO '.$TABLE_PREFIX.'tag2picture (`picture_id`,`tag_id`,`tagdate`)
+               VALUES ("'.$picture_id.'","'.$existing_tags[$tag].'",NOW())';
+         mysql_query($sql);
+      };
+   }
 
-        // now remove links to any tags that have been deleted
-        foreach($existing_rels as $tag_id => $pic_id) {
-                if (!in_array($tag_id,$existing_tags)) {
-                        $sql = "DELETE FROM `".$TABLE_PREFIX."tag2picture`
-                                        WHERE `picture_id` = '$picture_id' AND `tag_id` = '$tag_id'";  
-                        mysql_query($sql);
-                };
+   // now remove links to any tags that have been deleted
+   foreach($existing_rels as $tag_id => $pic_id) {
+      if (!in_array($tag_id,$existing_tags)) {
+         $sql = "DELETE FROM `".$TABLE_PREFIX."tag2picture`
+               WHERE `picture_id` = '$picture_id' AND `tag_id` = '$tag_id'";  
+         mysql_query($sql);
+      };
 
-        }
+   }
 }
 

branches/plogger-with-tags/unittests/tag-tests.php

@@ -2 +2 @@
    require_once 'lib/phpunit/PHPUnit.php';
    require_once 'lib/phpunit/PHPUnit/GUI/HTML.php';
-   
    require_once '../plog-tag-functions.php';
 
    function implode_with_key($assoc, $inglue = '=', $outglue = ' & ')
    {
-           foreach ($assoc as $tk => $tv) {
-                $return = (isset($return) ? $return . $outglue : '') . $tk . $inglue . $tv;
-           }
-           return $return;
+      foreach ($assoc as $tk => $tv) {
+         $return = (isset($return) ? $return . $outglue : '') . $tk . $inglue . $tv;
+      }
+      return $return;
    }
-            
+
    class TagTests extends PHPUnit_TestCase {
-       function test_parse_tags() {
+      function test_parse_tags() {
          $stuff = array();
-         
+
          $stuff = parse_tags("one    two");
          $res_content = "{ ".implode(", ", $stuff)." }";
@@ -53 +52 @@
          $this->assertContains("ten", $stuff, "Could not find tag 'ten' in: ".$res_content);
          $this->assertEquals(count($stuff), 5, "parse_tags result contains too many elements: ".$res_content);
-         
-         //More ideas:
-         // "text containing <html> symbols & ;"
-         // "text containing UTF characters áéÊðöß"
-       }
+
+         // text containing HTML symbols
+         $stuff = parse_tags("<html> & ;");
+         $res_content = "{ ".implode(", ", $stuff)." }";
+         $this->assertContains("<html>", $stuff, "Could not find tag '<html>' in: ".$res_content);
+         $this->assertContains("&", $stuff, "Could not find tag '&' in: ".$res_content);
+         $this->assertContains(";", $stuff, "Could not find tag ';' in: ".$res_content);
+         $this->assertEquals(count($stuff), 3, "parse_tags result contains too many elements: ".$res_content);
+
+         // text containing UTF symbols
+         $stuff = parse_tags("áé íó úÜ Êß ðö");
+         $res_content = "{ ".implode(", ", $stuff)." }";
+         $this->assertContains("áé", $stuff, "Could not find tag 'áé' in: ".$res_content );
+         $this->assertContains("íó", $stuff, "Could not find tag 'íó' in: ".$res_content);
+         $this->assertContains("úÜ", $stuff, "Could not find tag 'úÜ' in: ".$res_content);
+         $this->assertContains("Êß", $stuff, "Could not find tag 'Êß' in: ".$res_content);
+         $this->assertContains("ðö", $stuff, "Could not find tag 'ðö' in: ".$res_content);
+         $this->assertEquals(count($stuff), 5, "parse_tags result contains too many elements: ".$res_content);
+      }
+
+      function test_urlify_tag()
+      {
+         $this->assertEquals("%3Chtml%3E",urlify_tag("<html>"));
+         $this->assertEquals("this%26that",urlify_tag("this&that"));
+         $this->assertEquals("this%20%26%20that",urlify_tag("this & that"));
+         $this->assertEquals("here%20%2F%20there",urlify_tag("here / there"));
+      }
    }
 ?>