From 2212808508124c120a4e57177246628047a76c7a Mon Sep 17 00:00:00 2001
From: zapata <zapata>
Date: Sun, 10 Apr 2005 10:51:59 +0000
Subject: [PATCH] problem with ghost fragments appearing after generated files
 has been fixed

---
 source/mir/util/FileFunctions.java                                  | 6 ++++--
 source/mir/util/xml/html/HTMLScanner.java                           | 6 +++---
 .../localizer/basic/MirBasicProducerAssistantLocalizer.java         | 1 +
 source/mircoders/servlet/ServletModuleImages.java                   | 3 +--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/source/mir/util/FileFunctions.java b/source/mir/util/FileFunctions.java
index 476451c8..08fd66bc 100755
--- a/source/mir/util/FileFunctions.java
+++ b/source/mir/util/FileFunctions.java
@@ -144,8 +144,10 @@ public class FileFunctions {
       FileInputStream inputStream = new FileInputStream(aSource);
       FileOutputStream outputStream = new FileOutputStream(aDestination);
       try {
-        while (inputStream.read(buffer)>0) {
-          outputStream.write(buffer);
+        int count=inputStream.read(buffer);
+        while (count>0) {
+          outputStream.write(buffer, 0, count);
+          count=inputStream.read(buffer);
         }
       }
       finally {
diff --git a/source/mir/util/xml/html/HTMLScanner.java b/source/mir/util/xml/html/HTMLScanner.java
index 816c8fac..319d0533 100755
--- a/source/mir/util/xml/html/HTMLScanner.java
+++ b/source/mir/util/xml/html/HTMLScanner.java
@@ -30,7 +30,6 @@ public class HTMLScanner {
     while (!reader.isAtEnd()) {
       char c = reader.peek();
 
-      // TODO: << should result in the first < to be regarded as CDATA
       if (c != '<')
         readCData();
       else {
@@ -46,6 +45,9 @@ public class HTMLScanner {
             reader.get();
             readEndTag();
             break;
+          case '<':
+            receiver.handleCData(new String(new char[] {c }));
+            break;
           default:
             readTag();
         }
@@ -238,8 +240,6 @@ public class HTMLScanner {
       result.append(reader.get());
     }
 
-
-
     receiver.handleCData(HTMLRoutines.resolveHTMLEntites(result.toString()));
   }
 
diff --git a/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
index e4a16290..286d571c 100755
--- a/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
@@ -324,6 +324,7 @@ public class MirBasicProducerAssistantLocalizer implements MirProducerAssistantL
     public Utility () {
       super(new MirBasicUtilityFunctions());
     }
+
     public Object getDatetime() {
       return new GeneratorDateTimeFunctions.DateTimeFunctions(
         MirPropertiesConfiguration.instance().getString("Mir.DefaultTimezone"));
diff --git a/source/mircoders/servlet/ServletModuleImages.java b/source/mircoders/servlet/ServletModuleImages.java
index 0075463b..1bfe0d8d 100755
--- a/source/mircoders/servlet/ServletModuleImages.java
+++ b/source/mircoders/servlet/ServletModuleImages.java
@@ -36,13 +36,12 @@ import mircoders.module.ModuleImages;
 /*
  *  ServletModuleImages -
  *
- * @version $Id: ServletModuleImages.java,v 1.26.2.4 2004/11/21 22:07:14 zapata Exp $
+ * @version $Id: ServletModuleImages.java,v 1.26.2.5 2005/04/10 10:52:00 zapata Exp $
  * @author RK, the mir-coders group
  */
 
 public class ServletModuleImages extends ServletModuleUploadedMedia
 {
-  // Singelton / Kontruktor
   private static ServletModuleImages instance = new ServletModuleImages();
   public static ServletModule getInstance() { return instance; }
 
-- 
2.11.0