Changeset 77

Timestamp:

11/03/07 18:55:26 (6 years ago)

Author:

d0nut

Message:

updated tagging reloaded mainteance function

Location:

taggingreloaded

Files:

• files/lib/util/TaggingReloadedUtil.class.php (modified) (6 diffs)
• optionals/de.easy-coding.wbb.taggingreloaded/files/lib/acp/action/UpdateTaggingReloadedAction.class.php (moved) (moved from taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/files/lib/acp/action/UpdateTaggingReloaded.class.php) (8 diffs)
• templates/messageFormTaggingReloaded.tpl (modified) (2 diffs)

taggingreloaded/files/lib/util/TaggingReloadedUtil.class.php

@@ -48 +48 @@
          * @return text
          */
-        public function bbcode2text($text) {
+        public static function bbcode2text($text) {
                 // if there is bold text, then repeat the words
                 $text = preg_replace('/\[b\](.+)\[\/b\]/', '$1 $1', $text);
@@ -67 +67 @@
          * @return array
          */
-        public function text2tags($text, $limit=15) {
+        public static function text2tags($text, $limit=15) {
                 $tags = array();
 
@@ -77 +77 @@
 
                 // filter stopwords
-                $words = array_filter($words, array($this, "noStopword"));
+                //$words = array_filter($words, array($this, "noStopword"));
 
                 // search weights
@@ -93 +93 @@
                 array_walk($tags, create_function('&$val, $key','$val = array("weight"=>$val*100);'));
 
-                $tags = $this->beautify($tags, 100, 200);
+                $tags = TaggingReloadedUtil::beautify($tags, 100, 200);
 
                 // replace weights with sizes TODO: replace through array_walk
@@ -109 +109 @@
          * @param userID -> (optional)
          */
-        public function tags2db($taggingID, $tags, $userID=null) {
+        public static function tags2db($taggingID, $tags, $userID=null) {
                 if(count($tags) == 0) return;
 
@@ -136 +136 @@
          * @param array
          */
-        public function beautify($tags, $forced_minsize=null, $forced_maxsize=null) {
+        public static function beautify($tags, $forced_minsize=null, $forced_maxsize=null) {
                 // TODO: auslagern
                 $minsize = $forced_minsize === null ? 75 : $forced_minsize;

taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/files/lib/acp/action/UpdateTaggingReloadedAction.class.php

@@ -16 +16 @@
         public $everything = true;
         
-        protected function buildQuery() {
+        /**
+         *
+         * @param count
+         */
+        protected function buildQuery($count=false) {
                 if($this->everything) {
-                        $sql = "SELECT          postID,
+                        $columns = "            postID,
                                                 threadID, 
-                                                message
+                                                message";
+                        
+                        $sql = "SELECT          ".($count?'COUNT(*) AS count':$columns)."
                                 FROM            wbb".WBB_N."_post
                                 ORDER BY        threadID ASC,
@@ -27 +33 @@
                                 OFFSET          ".($this->limit * $this->loop);
                 } else {
-                        $sql = "SELECT          p2.postID,
+                        $columns = "            p2.postID,
                                                 p2.threadID, 
-                                                p2.message
+                                                p2.message";
+
+                        $sql = "SELECT          ".($count?'COUNT(*) AS count':$columns)."
                                 FROM            wbb".WBB_N."_post p
                                 JOIN            wbb".WBB_N."_thread t
@@ -37 +45 @@
                                 WHERE           p.systemTagged = 0
                                 ORDER BY        p2.threadID ASC,
-                                                p2.postID DESC";
+                                                p2.postID DESC
+                                LIMIT           ".$this->limit."
+                                OFFSET          ".($this->limit * $this->loop);
                 }
                 
@@ -50 +60 @@
                 $threadIDs = array();
                 $systemTaggerUserID = -1;
+                $text = '';
+                
+                // count board
+                $sql = $this->buildQuery(true);
+                $row = WCF::getDB()->getFirstRow($sql);
+                $count = $row['count'];
                 
                 // get all posts
@@ -59 +75 @@
                                 $threadID = $row['threadID'];
                                 $threadIDs[] = $threadID;
-
                                 $msg = TaggingReloadedUtil::bbcode2text($row['message']);
                                 $text .= $msg;
@@ -66 +81 @@
                                 $tags = TaggingReloadedUtil::text2tags($text);
                                 $first_post = $row['postID'];
-                                
+
                                 // CLEANUP system tags
                                 $sql = "DELETE FROM     wbb".WBB_N."_taggingreloaded, 
                                                         wcf".WCF_N."_taggingreloaded
-                                        USING           wbb".WBB_N."_taggingreloaded wbb
-                                        NATURAL JOIN    wcf".WCF_N."_taggingreloaded wcf
-                                        JOIN            wbb".WBB_N."_post p
-                                        ON              wbb.postID = p.postID
-                                        WHERE           userID = {$systemTaggerUserID}
-                                        AND             p.threadID = {$threadID};";
+                                        USING           wbb".WBB_N."_taggingreloaded
+                                        NATURAL JOIN    wcf".WCF_N."_taggingreloaded
+                                        JOIN            wbb".WBB_N."_post
+                                        ON              wbb".WBB_N."_taggingreloaded.postID = wbb".WBB_N."_post.postID
+                                        WHERE           wcf".WCF_N."_taggingreloaded.userID = {$systemTaggerUserID}
+                                        AND             wbb".WBB_N."_post.threadID = {$threadID};";
 
-                                WBBCore::getDB()->sendQuery($sql);
-
+                                WCF::getDB()->sendQuery($sql);
                                 if(count($tags) > 0) {
                                         $sql = "SELECT          taggingID
@@ -94 +108 @@
                                                         VALUES          ({$first_post});";
 
-                                                WBBCore::getDB()->sendQuery($sql);
+                                                WCF::getDB()->sendQuery($sql);
                                                 $taggingID = WBBCore::getDB()->getInsertID();
                                         }
@@ -109 +123 @@
                                         systemTagged = 1 
                         WHERE           threadID IN (".implode(',', $threadIDs)."); ";
-                WBBCore::getDB()->sendQuery($sql);
+                WCF::getDB()->sendQuery($sql);
 
                 $this->executed();
+
+                if($this->everything) {
                 
-                if($this->everything) {
                         $this->calcProgress(($this->limit * $this->loop), $count);
                         $this->nextLoop();

taggingreloaded/templates/messageFormTaggingReloaded.tpl

@@ -20 +20 @@
                 </div>
                 <div class="formField">
-                        <input type="text" name="inputTagging" id="inputTagging" size="40" />
+                        <input type="text" name="inputTagging" id="inputTagging" size="65" />
                         <input type="button" value="{lang}wcf.taggingreloaded.add{/lang}" onclick="tagging.formadd(this.form.inputTagging);" />
                         <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/Suggestion.class.js"></script>
@@ -34 +34 @@
                         <p>{lang}wcf.taggingreloaded.add.description{/lang}</p>
                 </div>
+                <p>{lang}wcf.taggingreloaded.add.instruction{/lang}</p>
         </div>
-        <p>{lang}wcf.taggingreloaded.add.instruction{/lang}</p>
-        
 </div>