From 55d560f3a01753db70ca18787974ff254d72c3df Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl@icu-project.org>
Date: Wed, 29 Jun 2005 16:33:06 +0000
Subject: [PATCH] ICU-3860 mostly just debugging, for calendars

X-SVN-Rev: 18085
---
 icu4c/source/i18n/calendar.cpp | 42 +++++++++++++++++++++++++++++++++-
 icu4c/source/i18n/japancal.cpp |  6 ++---
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp
index 66ca6a2aa5c..ae801310bef 100644
--- a/icu4c/source/i18n/calendar.cpp
+++ b/icu4c/source/i18n/calendar.cpp
@@ -110,6 +110,45 @@ static const char* fldName(UCalendarDateFields f) {
     }
 }
 
+
+
+// from CalendarTest::calToStr - but doesn't modify contents.
+void ucal_dump(const Calendar &cal) {
+    cal.dump();
+}
+
+void Calendar::dump() const {
+  int i;
+  fprintf(stderr, "@calendar=%s, timeset=%c, fieldset=%c, allfields=%c, virtualset=%c, t=%.2f",
+    getType(), fIsTimeSet?'y':'n',  fAreFieldsSet?'y':'n',  fAreAllFieldsSet?'y':'n',  
+        fAreFieldsVirtuallySet?'y':'n',
+        fTime);
+  
+  // can add more things here: DST, zone, etc.
+  fprintf(stderr, "\n");
+  for(i = 0;i<UCAL_FIELD_COUNT;i++) {
+    int n;
+    const char *f = fldName((UCalendarDateFields)i);
+    fprintf(stderr, "  %25s: %-11ld", f, fFields[i]);
+    if(fStamp[i] == kUnset) {
+        fprintf(stderr, " (unset) ");
+    } else if(fStamp[i] == kInternallySet) { 
+        fprintf(stderr, " (internally set) ");
+    //} else if(fStamp[i] == kInternalDefault) { 
+    //    fprintf(stderr, " (internal default) ");
+    } else {
+        fprintf(stderr, " %%%d ", fStamp[i]);
+    }
+    fprintf(stderr, "\n");
+    
+  }
+}
+
+U_CFUNC void ucal_dump(UCalendar* cal) {
+    ucal_dump( *((Calendar*)cal)  );
+}
+
+
 #endif
 
 static const char * const gCalendarKeywords[] = {
@@ -947,6 +986,7 @@ Calendar::clear()
         fIsSet[i]     = FALSE; // Remove later
     }
     fIsTimeSet = fAreFieldsSet = fAreAllFieldsSet = fAreFieldsVirtuallySet = FALSE;
+    // fTime is not 'cleared' - may be used if no fields are set.
 }
 
 // -------------------------------------
@@ -2433,7 +2473,7 @@ int32_t Calendar::handleComputeJulianDay(UCalendarDateFields bestField)  {
   }
 
 #if defined (U_DEBUG_CAL) 
-  fprintf(stderr, "%s:%d - bf= %s - y=%d\n", __FILE__, __LINE__, fldName(bestField), year);
+  fprintf(stderr, "%s:%d: bestField= %s - y=%d\n", __FILE__, __LINE__, fldName(bestField), year);
 #endif 
 
   // Get the Julian day of the day BEFORE the start of this year.
diff --git a/icu4c/source/i18n/japancal.cpp b/icu4c/source/i18n/japancal.cpp
index b356fd2fbdd..ba7483b8ff7 100644
--- a/icu4c/source/i18n/japancal.cpp
+++ b/icu4c/source/i18n/japancal.cpp
@@ -363,7 +363,7 @@ int32_t JapaneseCalendar::handleGetExtendedYear()
     year = internalGet(UCAL_EXTENDED_YEAR, 1);
   } else {
     // Subtract one because year starts at 1
-    year = internalGet(UCAL_YEAR) + kEraInfo[internalGet(UCAL_ERA, kCurrentEra)].year - 1;
+    year = internalGet(UCAL_YEAR) + kEraInfo[internalGetEra()].year - 1;
   }
   return year;
   
@@ -383,9 +383,9 @@ void JapaneseCalendar::handleComputeFields(int32_t julianDay, UErrorCode& status
   // Note that if the year is == the current era year, then we use
   // the binary search to handle the month/dom comparison.
 #ifdef U_DEBUG_JCAL
-  fprintf(stderr, "==  %d:%d \n", era, year);
+  fprintf(stderr, "==  %d \n", year);
 #endif
-
+    
   if (year > kEraInfo[kCurrentEra].year) {
     low = kCurrentEra;
 #ifdef U_DEBUG_JCAL