From 09a69be3c5c001890f22c96a80f3eb851ea54007 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 28 Oct 2011 23:53:51 +0000 Subject: [PATCH] 2011-10-29 01:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbziparc/ziparc.prg % minor optimization to last change. checkme. - contrib/hbxlsxml + examples/hbxlsxml ! moved to examples. this code is not even close to Harbour code quality and implements not .xls file format but HTML format renamed to .xls. It's not understood by lots of tools, it's not a standard. see details on list. --- harbour/ChangeLog | 12 ++++++++++++ harbour/contrib/hbziparc/ziparc.prg | 8 +++----- harbour/{contrib => examples}/hbxlsxml/hbxlsxml.hbp | 0 .../{contrib => examples}/hbxlsxml/tests/example.prg | 0 .../hbxlsxml/tests/example2.prg | 0 .../hbxlsxml/tests/example3.prg | 0 .../{contrib => examples}/hbxlsxml/tests/hbmk.hbm | 0 harbour/{contrib => examples}/hbxlsxml/xlsxml.prg | 0 harbour/{contrib => examples}/hbxlsxml/xlsxml_s.prg | 0 harbour/{contrib => examples}/hbxlsxml/xlsxml_y.prg | 0 10 files changed, 15 insertions(+), 5 deletions(-) rename harbour/{contrib => examples}/hbxlsxml/hbxlsxml.hbp (100%) rename harbour/{contrib => examples}/hbxlsxml/tests/example.prg (100%) rename harbour/{contrib => examples}/hbxlsxml/tests/example2.prg (100%) rename harbour/{contrib => examples}/hbxlsxml/tests/example3.prg (100%) rename harbour/{contrib => examples}/hbxlsxml/tests/hbmk.hbm (100%) rename harbour/{contrib => examples}/hbxlsxml/xlsxml.prg (100%) rename harbour/{contrib => examples}/hbxlsxml/xlsxml_s.prg (100%) rename harbour/{contrib => examples}/hbxlsxml/xlsxml_y.prg (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a852232605..3241342966 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2011-10-29 01:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbziparc/ziparc.prg + % minor optimization to last change. checkme. + + - contrib/hbxlsxml + + examples/hbxlsxml + ! moved to examples. this code is not even close + to Harbour code quality and implements not .xls + file format but HTML format renamed to .xls. It's + not understood by lots of tools, it's not a standard. + see details on list. + 2011-10-28 15:03 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxlsxml/xlsxml.prg * Fixed: a last moment introduced element. diff --git a/harbour/contrib/hbziparc/ziparc.prg b/harbour/contrib/hbziparc/ziparc.prg index a9c187e663..298ea47a38 100644 --- a/harbour/contrib/hbziparc/ziparc.prg +++ b/harbour/contrib/hbziparc/ziparc.prg @@ -422,10 +422,8 @@ FUNCTION hb_UnzipFile( cFileName, bUpdate, lWithPath, cPassword, cPath, acFiles, DEFAULT lWithPath TO .F. - IF lWithPath - IF hb_DirCreate( cPath ) != 0 .AND. !hb_DirExists( cPath ) - lRetVal := .F. - ENDIF + IF lWithPath .AND. ! hb_DirExists( cPath ) .AND. hb_DirCreate( cPath ) != 0 + lRetVal := .F. ENDIF IF Empty( cPassword ) @@ -474,7 +472,7 @@ FUNCTION hb_UnzipFile( cFileName, bUpdate, lWithPath, cPassword, cPath, acFiles, ENDIF nRead := 0 - DO WHILE ( nLen := hb_unZipFileRead( hUnzip, @cBuffer, Len( cBuffer ) ) ) > 0 + DO WHILE ( nLen := hb_UnzipFileRead( hUnzip, @cBuffer, Len( cBuffer ) ) ) > 0 IF hb_isBlock( bProgress ) nRead += nLen Eval( bProgress, nRead, nSize ) diff --git a/harbour/contrib/hbxlsxml/hbxlsxml.hbp b/harbour/examples/hbxlsxml/hbxlsxml.hbp similarity index 100% rename from harbour/contrib/hbxlsxml/hbxlsxml.hbp rename to harbour/examples/hbxlsxml/hbxlsxml.hbp diff --git a/harbour/contrib/hbxlsxml/tests/example.prg b/harbour/examples/hbxlsxml/tests/example.prg similarity index 100% rename from harbour/contrib/hbxlsxml/tests/example.prg rename to harbour/examples/hbxlsxml/tests/example.prg diff --git a/harbour/contrib/hbxlsxml/tests/example2.prg b/harbour/examples/hbxlsxml/tests/example2.prg similarity index 100% rename from harbour/contrib/hbxlsxml/tests/example2.prg rename to harbour/examples/hbxlsxml/tests/example2.prg diff --git a/harbour/contrib/hbxlsxml/tests/example3.prg b/harbour/examples/hbxlsxml/tests/example3.prg similarity index 100% rename from harbour/contrib/hbxlsxml/tests/example3.prg rename to harbour/examples/hbxlsxml/tests/example3.prg diff --git a/harbour/contrib/hbxlsxml/tests/hbmk.hbm b/harbour/examples/hbxlsxml/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbxlsxml/tests/hbmk.hbm rename to harbour/examples/hbxlsxml/tests/hbmk.hbm diff --git a/harbour/contrib/hbxlsxml/xlsxml.prg b/harbour/examples/hbxlsxml/xlsxml.prg similarity index 100% rename from harbour/contrib/hbxlsxml/xlsxml.prg rename to harbour/examples/hbxlsxml/xlsxml.prg diff --git a/harbour/contrib/hbxlsxml/xlsxml_s.prg b/harbour/examples/hbxlsxml/xlsxml_s.prg similarity index 100% rename from harbour/contrib/hbxlsxml/xlsxml_s.prg rename to harbour/examples/hbxlsxml/xlsxml_s.prg diff --git a/harbour/contrib/hbxlsxml/xlsxml_y.prg b/harbour/examples/hbxlsxml/xlsxml_y.prg similarity index 100% rename from harbour/contrib/hbxlsxml/xlsxml_y.prg rename to harbour/examples/hbxlsxml/xlsxml_y.prg