updated to the new Pikotools API

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1071 e52654a7-88a9-db11-a3e9-0013d4bc506e
2018-01-06 18:12:53 +00:00
parent 3eff400d88
commit ccf78dcb02
48 changed files with 766 additions and 390 deletions
--- a/winixd/plugins/ticket/Makefile.dep
+++ b/winixd/plugins/ticket/Makefile.dep
@@ -12,6 +12,8 @@ createticket.o: ../../../../winix/winixd/core/requesttypes.h
 createticket.o: ../../../../pikotools/textstream/textstream.h
 createticket.o: ../../../../pikotools/convert/convert.h
 createticket.o: ../../../../pikotools/convert/inttostr.h
+createticket.o: ../../../../pikotools/convert/strtoint.h
+createticket.o: ../../../../pikotools/convert/text.h
 createticket.o: ../../../../pikotools/membuffer/membuffer.h
 createticket.o: ../../../../pikotools/textstream/types.h
 createticket.o: ../../../../pikotools/utf8/utf8.h
@@ -167,6 +169,13 @@ editticket.o: ../../../../pikotools/textstream/types.h
 editticket.o: ../../../../pikotools/date/date.h
 editticket.o: ../../../../pikotools/convert/convert.h
 editticket.o: ../../../../pikotools/convert/inttostr.h
+editticket.o: ../../../../pikotools/convert/strtoint.h
+editticket.o: ../../../../pikotools/convert/text.h
+editticket.o: ../../../../winix/winixd/core/misc.h
+editticket.o: ../../../../winix/winixd/core/item.h
+editticket.o: ../../../../winix/winixd/core/requesttypes.h
+editticket.o: ../../../../pikotools/utf8/utf8.h
+editticket.o: ../../../../winix/winixd/core/winix_const.h
 editticket.o: ../../../../pikotools/membuffer/membuffer.h
 editticket.o: ../../../../pikotools/textstream/types.h
 editticket.o: ../../../../pikotools/space/spaceparser.h
@@ -179,11 +188,6 @@ editticket.o: ../../../../winix/winixd/core/dircontainer.h
 editticket.o: ../../../../winix/winixd/core/ugcontainer.h
 editticket.o: ../../../../winix/winixd/core/log.h
 editticket.o: ../../../../winix/winixd/core/textstream.h
-editticket.o: ../../../../winix/winixd/core/misc.h
-editticket.o: ../../../../winix/winixd/core/item.h
-editticket.o: ../../../../winix/winixd/core/requesttypes.h
-editticket.o: ../../../../pikotools/utf8/utf8.h
-editticket.o: ../../../../winix/winixd/core/winix_const.h
 editticket.o: ../../../../winix/winixd/core/logmanipulators.h
 editticket.o: ../../../../winix/winixd/core/slog.h
 editticket.o: ../../../../winix/winixd/core/cur.h
@@ -315,6 +319,13 @@ funticket.o: ../../../../pikotools/textstream/types.h
 funticket.o: ../../../../pikotools/date/date.h
 funticket.o: ../../../../pikotools/convert/convert.h
 funticket.o: ../../../../pikotools/convert/inttostr.h
+funticket.o: ../../../../pikotools/convert/strtoint.h
+funticket.o: ../../../../pikotools/convert/text.h
+funticket.o: ../../../../winix/winixd/core/misc.h
+funticket.o: ../../../../winix/winixd/core/item.h
+funticket.o: ../../../../winix/winixd/core/requesttypes.h
+funticket.o: ../../../../pikotools/utf8/utf8.h
+funticket.o: ../../../../winix/winixd/core/winix_const.h
 funticket.o: ../../../../pikotools/membuffer/membuffer.h
 funticket.o: ../../../../pikotools/textstream/types.h
 funticket.o: ../../../../pikotools/space/spaceparser.h
@@ -327,11 +338,6 @@ funticket.o: ../../../../winix/winixd/core/dircontainer.h
 funticket.o: ../../../../winix/winixd/core/ugcontainer.h
 funticket.o: ../../../../winix/winixd/core/log.h
 funticket.o: ../../../../winix/winixd/core/textstream.h
-funticket.o: ../../../../winix/winixd/core/misc.h
-funticket.o: ../../../../winix/winixd/core/item.h
-funticket.o: ../../../../winix/winixd/core/requesttypes.h
-funticket.o: ../../../../pikotools/utf8/utf8.h
-funticket.o: ../../../../winix/winixd/core/winix_const.h
 funticket.o: ../../../../winix/winixd/core/logmanipulators.h
 funticket.o: ../../../../winix/winixd/core/slog.h
 funticket.o: ../../../../winix/winixd/core/cur.h
@@ -461,6 +467,13 @@ init.o: ../../../../pikotools/textstream/types.h
 init.o: ../../../../pikotools/date/date.h
 init.o: ../../../../pikotools/convert/convert.h
 init.o: ../../../../pikotools/convert/inttostr.h
+init.o: ../../../../pikotools/convert/strtoint.h
+init.o: ../../../../pikotools/convert/text.h
+init.o: ../../../../winix/winixd/core/misc.h
+init.o: ../../../../winix/winixd/core/item.h
+init.o: ../../../../winix/winixd/core/requesttypes.h
+init.o: ../../../../pikotools/utf8/utf8.h
+init.o: ../../../../winix/winixd/core/winix_const.h
 init.o: ../../../../pikotools/membuffer/membuffer.h
 init.o: ../../../../pikotools/textstream/types.h
 init.o: ../../../../pikotools/space/spaceparser.h
@@ -473,11 +486,6 @@ init.o: ../../../../winix/winixd/core/dircontainer.h
 init.o: ../../../../winix/winixd/core/ugcontainer.h
 init.o: ../../../../winix/winixd/core/log.h
 init.o: ../../../../winix/winixd/core/textstream.h
-init.o: ../../../../winix/winixd/core/misc.h
-init.o: ../../../../winix/winixd/core/item.h
-init.o: ../../../../winix/winixd/core/requesttypes.h
-init.o: ../../../../pikotools/utf8/utf8.h
-init.o: ../../../../winix/winixd/core/winix_const.h
 init.o: ../../../../winix/winixd/core/logmanipulators.h
 init.o: ../../../../winix/winixd/core/slog.h
 init.o: ../../../../winix/winixd/core/cur.h
@@ -619,6 +627,13 @@ showtickets.o: ../../../../pikotools/textstream/types.h
 showtickets.o: ../../../../pikotools/date/date.h
 showtickets.o: ../../../../pikotools/convert/convert.h
 showtickets.o: ../../../../pikotools/convert/inttostr.h
+showtickets.o: ../../../../pikotools/convert/strtoint.h
+showtickets.o: ../../../../pikotools/convert/text.h
+showtickets.o: ../../../../winix/winixd/core/misc.h
+showtickets.o: ../../../../winix/winixd/core/item.h
+showtickets.o: ../../../../winix/winixd/core/requesttypes.h
+showtickets.o: ../../../../pikotools/utf8/utf8.h
+showtickets.o: ../../../../winix/winixd/core/winix_const.h
 showtickets.o: ../../../../pikotools/membuffer/membuffer.h
 showtickets.o: ../../../../pikotools/textstream/types.h
 showtickets.o: ../../../../pikotools/space/spaceparser.h
@@ -631,11 +646,6 @@ showtickets.o: ../../../../winix/winixd/core/dircontainer.h
 showtickets.o: ../../../../winix/winixd/core/ugcontainer.h
 showtickets.o: ../../../../winix/winixd/core/log.h
 showtickets.o: ../../../../winix/winixd/core/textstream.h
-showtickets.o: ../../../../winix/winixd/core/misc.h
-showtickets.o: ../../../../winix/winixd/core/item.h
-showtickets.o: ../../../../winix/winixd/core/requesttypes.h
-showtickets.o: ../../../../pikotools/utf8/utf8.h
-showtickets.o: ../../../../winix/winixd/core/winix_const.h
 showtickets.o: ../../../../winix/winixd/core/logmanipulators.h
 showtickets.o: ../../../../winix/winixd/core/slog.h
 showtickets.o: ../../../../winix/winixd/core/cur.h
@@ -775,6 +785,11 @@ templates.o: ../../../../winix/winixd/core/textstream.h
 templates.o: ../../../../pikotools/textstream/textstream.h
 templates.o: ../../../../pikotools/convert/convert.h
 templates.o: ../../../../pikotools/convert/inttostr.h
+templates.o: ../../../../pikotools/convert/strtoint.h
+templates.o: ../../../../pikotools/convert/text.h
+templates.o: ../../../../winix/winixd/core/misc.h
+templates.o: ../../../../winix/winixd/core/requesttypes.h
+templates.o: ../../../../winix/winixd/core/winix_const.h
 templates.o: ../../../../pikotools/membuffer/membuffer.h
 templates.o: ../../../../pikotools/textstream/types.h
 templates.o: ../../../../winix/winixd/core/error.h
@@ -788,9 +803,6 @@ templates.o: ../../../../winix/winixd/core/dircontainer.h
 templates.o: ../../../../winix/winixd/core/ugcontainer.h
 templates.o: ../../../../winix/winixd/core/log.h
 templates.o: ../../../../winix/winixd/core/textstream.h
-templates.o: ../../../../winix/winixd/core/misc.h
-templates.o: ../../../../winix/winixd/core/requesttypes.h
-templates.o: ../../../../winix/winixd/core/winix_const.h
 templates.o: ../../../../winix/winixd/core/logmanipulators.h
 templates.o: ../../../../winix/winixd/core/slog.h
 templates.o: ../../../../winix/winixd/core/cur.h
@@ -919,6 +931,13 @@ ticketinfo.o: ../../../../pikotools/textstream/types.h
 ticketinfo.o: ../../../../pikotools/date/date.h
 ticketinfo.o: ../../../../pikotools/convert/convert.h
 ticketinfo.o: ../../../../pikotools/convert/inttostr.h
+ticketinfo.o: ../../../../pikotools/convert/strtoint.h
+ticketinfo.o: ../../../../pikotools/convert/text.h
+ticketinfo.o: ../../../../winix/winixd/core/misc.h
+ticketinfo.o: ../../../../winix/winixd/core/item.h
+ticketinfo.o: ../../../../winix/winixd/core/requesttypes.h
+ticketinfo.o: ../../../../pikotools/utf8/utf8.h
+ticketinfo.o: ../../../../winix/winixd/core/winix_const.h
 ticketinfo.o: ../../../../pikotools/membuffer/membuffer.h
 ticketinfo.o: ../../../../pikotools/textstream/types.h
 ticketinfo.o: ../../../../winix/winixd/core/error.h
@@ -932,11 +951,6 @@ ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h
 ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h
 ticketinfo.o: ../../../../winix/winixd/core/log.h
 ticketinfo.o: ../../../../winix/winixd/core/textstream.h
-ticketinfo.o: ../../../../winix/winixd/core/misc.h
-ticketinfo.o: ../../../../winix/winixd/core/item.h
-ticketinfo.o: ../../../../winix/winixd/core/requesttypes.h
-ticketinfo.o: ../../../../pikotools/utf8/utf8.h
-ticketinfo.o: ../../../../winix/winixd/core/winix_const.h
 ticketinfo.o: ../../../../winix/winixd/core/logmanipulators.h
 ticketinfo.o: ../../../../winix/winixd/core/slog.h
 ticketinfo.o: ../../../../winix/winixd/core/cur.h
--- a/winixd/plugins/ticket/Makefile.o.dep
+++ b/winixd/plugins/ticket/Makefile.o.dep
@@ -1 +1 @@
-o = createticket.o editticket.o funticket.o init.o sessiondata.o showtickets.o tdb.o templates.o ticketinfo.o 
+o = createticket.o editticket.o funticket.o init.o sessiondata.o showtickets.o tdb.o templates.o ticketinfo.o 
--- a/winixd/plugins/ticket/sessiondata.cpp
+++ b/winixd/plugins/ticket/sessiondata.cpp
@@ -5,7 +5,7 @@
 */

 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
@@ -162,7 +162,7 @@ void SessionData::CheckFile(std::vector<long> & file_tab, PT::Space & space)

 		if( subsp.name == L"file" )
 		{
-			std::wstring * file_id_str = subsp.GetValue(L"itemid");
+			std::wstring * file_id_str = subsp.GetFirstValue(L"itemid");

 			if( file_id_str )
 			{
--- a/winixd/plugins/ticket/templates.cpp
+++ b/winixd/plugins/ticket/templates.cpp
@@ -5,7 +5,7 @@
 */

 /* 
- * Copyright (c) 2008-2014, Tomasz Sowa
+ * Copyright (c) 2008-2018, Tomasz Sowa
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
@@ -267,14 +267,14 @@ void ticket_print_value(Info & i, TicketValue & value)
 	if( !value.is_param || !value.is_value )
 		return;

-	std::wstring & type = value.config_par->Text(L"type");
+	std::wstring * type = value.config_par->GetFirstValue(L"type");

 	if( value.is_in_ticket_par )
 	{
-		if( type == L"decimal" )
+		if( type && *type == L"decimal" )
 			i.out << value.ticket_par->decv;
 		else
-		if( type == L"select" )
+		if( type && *type == L"select" )
 			ticket_print_value_select(i, value);
 		else
 			i.out << value.ticket_par->intv;
@@ -751,8 +751,10 @@ void tickets_tab_conf_tab_param_name(Info & i)

 	if( value.is_param )
 	{
-		std::wstring & name = value.config_par->Text(L"name");
-		i.out << name;
+		std::wstring * name = value.config_par->GetFirstValue(L"name");
+
+		if( name )
+			i.out << *name;
 	}
 }

--- a/winixd/plugins/ticket/ticketinfo.cpp
+++ b/winixd/plugins/ticket/ticketinfo.cpp
@@ -5,7 +5,7 @@
 */

 /* 
- * Copyright (c) 2010-2014, Tomasz Sowa
+ * Copyright (c) 2010-2018, Tomasz Sowa
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
@@ -166,7 +166,6 @@ bool TicketInfo::ParseTicketConf(long mount_dir_id, const std::wstring & path)

 	conf_tab[mount_dir_id].file_name = path;
 	conf_parser.SetSpace(conf_tab[mount_dir_id].conf);
-	conf_parser.SplitSingle(true);
 	conf_tab[mount_dir_id].conf.Clear();

 return (conf_parser.ParseString(config_file.content) == PT::SpaceParser::ok);
@@ -264,10 +263,15 @@ void TicketInfo::FindCurrentConf()

 void TicketInfo::CheckMinMaxValue(PT::Space & space, Ticket::TicketParam & par)
 {
-	if( space.Text(L"type") == L"integer" )
+	std::wstring * type = space.GetFirstValue(L"type");
+
+	if( !type )
+		return;
+
+	if( *type == L"integer" )
 	{
-		std::wstring * min_str = space.GetValue(L"min");
-		std::wstring * max_str = space.GetValue(L"min");
+		std::wstring * min_str = space.GetFirstValue(L"min");
+		std::wstring * max_str = space.GetFirstValue(L"min");

 		if( min_str )
 		{
@@ -286,7 +290,7 @@ void TicketInfo::CheckMinMaxValue(PT::Space & space, Ticket::TicketParam & par)
 		}
 	}
 	else
-	if( space.Text(L"type") == L"progress" )
+	if( *type == L"progress" )
 	{
 		// !! dodac tez min/max
 		if( par.intv < 0 )
@@ -296,7 +300,7 @@ void TicketInfo::CheckMinMaxValue(PT::Space & space, Ticket::TicketParam & par)
 			par.intv = 100;
 	}	
 	else
-	if( space.Text(L"type") == L"select" ) 
+	if( *type == L"select" )
 	{
 		for(size_t a=0 ; a<space.spaces.size() ; ++a)
 		{
@@ -306,7 +310,11 @@ void TicketInfo::CheckMinMaxValue(PT::Space & space, Ticket::TicketParam & par)
 				return;
 		}

-		par.intv = Tol(space.Text(L"default"));
+		par.intv = 0;
+		std::wstring * def = space.GetFirstValue(L"default");
+
+		if( def )
+			par.intv = Tol(*def);
 	}
 }

@@ -416,13 +424,15 @@ void TicketInfo::ReadTicketValue(PT::Space & space,
 void TicketInfo::ReadTicketValue(PT::Space & space,
 								 long param_id, const PostFile & value, PT::Space & meta)
 {
-	if( space.Text(L"type") == L"images" || space.Text(L"type") == L"files" )
-	{
-		std::wstring & upload_path = space.Text(L"upload_dir");
+	std::wstring * type = space.GetFirstValue(L"type");

-		if( !upload_path.empty() )
+	if( type && (*type == L"images" || *type == L"files") )
+	{
+		std::wstring * upload_path = space.GetFirstValue(L"upload_dir");
+
+		if( upload_path && !upload_path->empty() )
 		{
-			Item * upload_dir = system->dirs.GetDir(upload_path);
+			Item * upload_dir = system->dirs.GetDir(*upload_path);

 			if( upload_dir )
 				ReadTicketValue(space, param_id, value, meta, *upload_dir);