/src/edu/ucsb/nceas/metacat/MetaCatUtil.java - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 2339

Added by sgarg over 19 years ago

Made changes to fix bug# 1538. Changed the code of the normalize function in MetaCatUtil.java. Earlier code was not taking care of characters above 123.

In DBSAXHandler.java, added call to normalize function before text is written to db.

+        {
             StringBuffer str = new StringBuffer();
             int len = (s != null) ? s.length() : 0;
             for (int i = 0; i < len; i++) {
                 char ch = s.charAt(i);
                 switch (ch) {
                 case '<':
+                    {
                         str.append("&lt;");
                         break;
+                    }
                 case '>':
+                    {
                         str.append("&gt;");
                         break;
+                    }
                 case '&':
+                    {
                         str.append("&amp;");
                         break;
+                    }
                 case '"':
+                    {
                         str.append("&quot;");
                         break;
+                    }
                 case '\r':
                 case '\n':
+                    {
                         // else, default append char
+                    }
                 default:
+                    {
                         str.append(ch);
+                    }
+                }
+            }
             return (str.toString());
                  int len = (s != null) ? s.length() : 0;
                  for (int i = 0; i < len; i++) {
                      char ch = s.charAt(i);
                      switch (ch) {
                          case '<': {
                              str.append("&lt;");
                              break;
+                         }
                          case '>': {
                              str.append("&gt;");
                              break;
+                         }
                          case '&': {
                              str.append("&amp;");
                              break;
+                         }
                          case '"': {
                              str.append("&quot;");
                              break;
+                         }
                          default: {
                              if ((ch<128)&&(ch>31)) {
                                  str.append(ch);
+                             }
                              else if (ch<32) {
                                  if (ch== 10) {
                                      str.append(ch);
+                                 }
                                  if (ch==13) {
                                      str.append(ch);
+                                 }
                                  if (ch==9) {
                                      str.append(ch);
+                                 }
                                  // otherwise skip
+                             }
                              else {
                                  str.append("&#");
                                  str.append(Integer.toString(ch));
                                  str.append(';');
+                             }
+                         }
+                     }
+                 }
                  String temp = str.toString();
                  temp = temp.trim();
                  if (temp.length()<1) temp = " ";
                  return temp;
+        }
         /**

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 2339

Added by sgarg over 19 years ago