From: Miloš Mulač <mulac@civ.zcu.cz>
Date: Tue, 6 Feb 2007 11:27:41 +0000 (+0000)
Subject: do not lovercase first character of PBS events
X-Git-Tag: gridsite-core_R_1_4_0~18
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=2f6c3bf879c0ca1a8f71353e9ee8b92d23814c6f;p=jra1mw.git

do not lovercase first character of PBS events
- cosmetics, but pBSDone looks really ugly
---

diff --git a/org.glite.lb.client-interface/interface/events.h.T b/org.glite.lb.client-interface/interface/events.h.T
index ddb1674..1ba8356 100644
--- a/org.glite.lb.client-interface/interface/events.h.T
+++ b/org.glite.lb.client-interface/interface/events.h.T
@@ -308,6 +308,7 @@ $indent = "\t";
 for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
 		$event->getTypes) {
 	my $tl = lcfirst $t;
+	if ($tl =~ m/^pBS/) { $tl = ucfirst $tl; }
 	gen $indent."edg_wll_${t}Event\t${tl};\n";
 }
 @@@}
diff --git a/org.glite.lb.client/src/Event.cpp.T b/org.glite.lb.client/src/Event.cpp.T
index 7e32f62..6e3ac3e 100644
--- a/org.glite.lb.client/src/Event.cpp.T
+++ b/org.glite.lb.client/src/Event.cpp.T
@@ -39,6 +39,7 @@ sub typeswitch {
 		my $f = selectField $event $_;
 		if($ctype{$f->{type}}) {
   		  my $cstr = $ftype eq '_common_' ? 'any' : lcfirst $ftype;
+		  if ($cstr =~ m/^pBS/) { $cstr = ucfirst $cstr; }
 		  my $cname = getName $f 'C';
 		  gen "$indent\tcase Event::".uc($f->{name}).": return(cev->$cstr.$cname);\n";
 		} elsif (($f->{type} eq "int") && 
@@ -46,6 +47,7 @@ sub typeswitch {
 			 $f->{codes}) {
 		  # conversion from int to string (well, enum to string)
   		  my $cstr = $ftype eq '_common_' ? 'any' : lcfirst $ftype;
+		  if ($cstr =~ m/^pBS/) { $cstr = ucfirst $cstr; }
 		  my $cname = getName $f 'C';
 		  my $fn = $ftype eq '_common_' ? "" : ucfirst $ftype;
 		  my $c =  $fn . ucfirst $f->{name}; 
diff --git a/org.glite.lb.common/src/events.c.T b/org.glite.lb.common/src/events.c.T
index 4de3c32..d46529c 100644
--- a/org.glite.lb.common/src/events.c.T
+++ b/org.glite.lb.common/src/events.c.T
@@ -278,6 +278,7 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
 		$event->getTypes) {
 	my $tu = uc $t;
 	my $tl = lcfirst $t;
+	if ($tl =~ m/^pBS/) { $tl = ucfirst $tl; }
 	gen $indent."case EDG_WLL_EVENT_$tu : \n";
 	selectType $event $t;
 	for ($event->getFieldsOrdered) {
@@ -330,6 +331,7 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
 		$event->getTypes) {
 	my $tu = uc $t;
 	my $tl = lcfirst $t;
+	if ($tl =~ m/^pBS/) { $tl = ucfirst $tl; }
 	gen $indent."case EDG_WLL_EVENT_$tu :\n";
 	selectType $event $t;
 	for ($event->getFieldsOrdered) {
diff --git a/org.glite.lb.common/src/events_parse.c.T b/org.glite.lb.common/src/events_parse.c.T
index 36f2d83..6b83e24 100644
--- a/org.glite.lb.common/src/events_parse.c.T
+++ b/org.glite.lb.common/src/events_parse.c.T
@@ -131,6 +131,7 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
 		$event->getTypes) {
 	my $tu = uc $t;
 	my $tl = lcfirst $t;
+	if ($tl =~ m/^pBS/) { $tl = ucfirst $tl; }
 	my $misuse = "if (eventcode != EDG_WLL_EVENT_$tu ) MISUSE";
 	selectType $event $t;
 	for ($event->getFieldsOrdered) {
@@ -257,6 +258,7 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
 		$event->getTypes) {
 	my $tu = uc $t;
 	my $tl = lcfirst $t;
+	if ($tl =~ m/^pBS/) { $tl = ucfirst $tl; }
 	my $free = "";
 	gen $indent."case EDG_WLL_EVENT_$tu :\n";
 	gen "\t\{";
@@ -389,6 +391,7 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
 		$event->getTypes) {
 	my $tu = uc $t;
 	my $tl = lcfirst $t;
+	if ($tl =~ m/^pBS/) { $tl = ucfirst $tl; }
 	gen $indent."case EDG_WLL_EVENT_$tu :\n";
 	selectType $event $t;
 	for ($event->getFieldsOrdered) {
@@ -448,6 +451,7 @@ edg_wll_ErrorCode edg_wll_CompareEvents(
 	{
 		my $tu = uc $t;
 		my $tl = lcfirst $t;
+		if ($tl =~ m/^pBS/) { $tl = ucfirst $tl; }
 
 		selectType $event $t;
 		gen "\t\tcase EDG_WLL_EVENT\_$tu :\n";
@@ -617,6 +621,7 @@ for (i=0; i<table->num; i++) {
 	my $t = 'Notification';
 	my $tu = uc $t;
 	my $tl = lcfirst $t;
+	if ($tl =~ m/^pBS/) { $tl = ucfirst $tl; }
 	my $misuse = "if (eventcode != EDG_WLL_EVENT_$tu ) MISUSE";
 	selectType $event $t;
 	for ($event->getFieldsOrdered) {
@@ -715,6 +720,7 @@ $indent = "   ";
 	my $t = 'Notification';
 	my $tu = uc $t;
 	my $tl = lcfirst $t;
+	if ($tl =~ m/^pBS/) { $tl = ucfirst $tl; }
 	my $free = "";
 ##	gen $indent."case EDG_WLL_EVENT_$tu :\n";
 	gen "\t\{";
diff --git a/org.glite.lb.common/src/xml_parse.c.T b/org.glite.lb.common/src/xml_parse.c.T
index 800fc12..3b7cecc 100644
--- a/org.glite.lb.common/src/xml_parse.c.T
+++ b/org.glite.lb.common/src/xml_parse.c.T
@@ -814,6 +814,7 @@ static void endQueryEvents(void *data, const char *el UNUSED_VAR)
                         my $f = selectField $event $t;
                         my $ft = $f->{type};
 			$fo[0] = $fo[0] eq '_common_' ? 'any' : lcfirst $fo[0];
+			if ($fo[0] =~ m/^pBS/) { $fo[0] = ucfirst $fo[0]; }
                         gen "$bi   XMLCtx->eventsOutGlobal[XMLCtx->position].$fo[0].$t =\n";
                         gen "$bi \tedg_wll_from_string_to_$ft(XMLCtx);\n";
                 }
@@ -826,6 +827,7 @@ static void endQueryEvents(void *data, const char *el UNUSED_VAR)
 	                        $t = 'any' if $_ eq '_common_';
         	                my $u = uc $_;
 				$_ = lcfirst $_;
+				if ($_ =~ m/^pBS/) { $_ = ucfirst $_; }
                 	        gen "$bi     case EDG_WLL_EVENT_$u :\n";
                         	gen "$bi \t  XMLCtx->eventsOutGlobal[XMLCtx->position].$_.$t =\n";
 	                        gen "$bi \t    edg_wll_from_string_to_$ft(XMLCtx);\n";
diff --git a/org.glite.lb.common/test/parse.cpp.T b/org.glite.lb.common/test/parse.cpp.T
index 896c227..5045494 100644
--- a/org.glite.lb.common/test/parse.cpp.T
+++ b/org.glite.lb.common/test/parse.cpp.T
@@ -15,6 +15,7 @@ class EventParseTest: public  CppUnit::TestFixture
 @@@{
         for my $e ($event->getTypesOrdered) {
                 my $u = lcfirst $e;
+		if ($u =~ m/^pBS/) { $u = ucfirst $u; }
                 my $c = getTypeComment $event $e;
                 gen "\tCPPUNIT_TEST($u);\n";
         }
@@ -28,6 +29,7 @@ public:
 @@@{
         for my $e ($event->getTypesOrdered) {
                 my $u = lcfirst $e;
+		if ($u =~ m/^pBS/) { $u = ucfirst $u; }
                 my $c = getTypeComment $event $e;
                 gen "\tvoid $u();\n";
         }
@@ -84,6 +86,7 @@ void EventParseTest::regJob()
 @@@{
         for my $e ($event->getTypesOrdered) {
                 my $l = lcfirst $e;
+		if ($l =~ m/^pBS/) { $l = ucfirst $l; }
                 my $u = uc $e;
                 my $c = getTypeComment $event $e;
                 gen "
diff --git a/org.glite.lb.server/src/get_events.c.T b/org.glite.lb.server/src/get_events.c.T
index a4b2f6e..c58c523 100644
--- a/org.glite.lb.server/src/get_events.c.T
+++ b/org.glite.lb.server/src/get_events.c.T
@@ -121,6 +121,7 @@ static void edg_wll_set_event_field(
 			my $fucname = ucfirst $n;
 			my $uctype = uc $_;
 			my $flctype = lcfirst $_;
+			if ($flctype =~ m/^pBS/) { $flctype = ucfirst $flctype; }
 			my $frs = $f->{codes} ?
 				"event->$flctype.$name = edg_wll_StringTo$_${fucname}(value);" :
 				fromString $f 'value',"event->$flctype.$name";
diff --git a/org.glite.lb.server/src/lb_xml_parse.c.T b/org.glite.lb.server/src/lb_xml_parse.c.T
index 2365cea..a165486 100644
--- a/org.glite.lb.server/src/lb_xml_parse.c.T
+++ b/org.glite.lb.server/src/lb_xml_parse.c.T
@@ -1492,6 +1492,7 @@ int edg_wll_QueryEventsToXML(edg_wll_Context ctx, edg_wll_Event *eventsOut, char
                                 my $ft = $f->{type};
 				my $n = $f->{null};
 				$t = lcfirst $t;
+				if ($t =~ m/^pBS/) { $t = ucfirst $t; }
                                 gen "\t\tedg_wll_add_$ft\_to_XMLBody(&pomB, eventsOut[i].$t.$_, \"$_\", $n);\n";
                         }
                 	gen "\t\tbreak;\n";
diff --git a/org.glite.lb.server/src/lb_xml_parse_V21.c.T b/org.glite.lb.server/src/lb_xml_parse_V21.c.T
index 8f20082..b1ddbb0 100644
--- a/org.glite.lb.server/src/lb_xml_parse_V21.c.T
+++ b/org.glite.lb.server/src/lb_xml_parse_V21.c.T
@@ -872,6 +872,7 @@ int edg_wll_QueryEventsToXMLV21(edg_wll_Context ctx UNUSED_VAR, edg_wll_Event *e
                                 my $ft = $f->{type};
 				my $n = $f->{null};
 				$t = lcfirst $t;
+				if ($t =~ m/^pBS/) { $t = ucfirst $t; }
                                 gen "\t\tedg_wll_add_$ft\_to_XMLBody(&pomB, eventsOut[i].$t.$_, \"$_\", $n);\n";
                         }
                 	gen "\t\tbreak;\n";
diff --git a/org.glite.lb.server/src/process_event_pbs.c b/org.glite.lb.server/src/process_event_pbs.c
index f125ed0..c6c4fcd 100644
--- a/org.glite.lb.server/src/process_event_pbs.c
+++ b/org.glite.lb.server/src/process_event_pbs.c
@@ -60,7 +60,7 @@ int processEvent_PBS(intJobStat *js, edg_wll_Event *e, int ev_seq, int strict, c
 				rep(js->pub.pbs_state, "Q");
 			}
 			if (USABLE_DATA(res)) {
-				js->pub.pbs_queue = strdup(e->pBSReg.queue);
+				js->pub.pbs_queue = strdup(e->PBSReg.queue);
 			}
 			break;
 		case EDG_WLL_EVENT_PBSQUEUED:
@@ -70,10 +70,10 @@ int processEvent_PBS(intJobStat *js, edg_wll_Event *e, int ev_seq, int strict, c
 			}
 			if (USABLE_DATA(res)) {
 				if (!js->pub.pbs_queue)
-					strdup(e->pBSQueued.queue);
-				assert(!strcmp(js->pub.pbs_queue, e->pBSQueued.queue));
-				rep(js->pub.pbs_owner,e->pBSQueued.owner);
-				rep(js->pub.pbs_name,e->pBSQueued.name);
+					strdup(e->PBSQueued.queue);
+				assert(!strcmp(js->pub.pbs_queue, e->PBSQueued.queue));
+				rep(js->pub.pbs_owner,e->PBSQueued.owner);
+				rep(js->pub.pbs_name,e->PBSQueued.name);
 			}
 			break;
 		case EDG_WLL_EVENT_PBSPLAN:
@@ -90,9 +90,9 @@ int processEvent_PBS(intJobStat *js, edg_wll_Event *e, int ev_seq, int strict, c
 				rep(js->pub.pbs_state, "R");
 			}
 			if (USABLE_DATA(res)) {
-				rep(js->pub.pbs_scheduler, e->pBSRun.scheduler);
-				rep(js->pub.pbs_dest_host, e->pBSRun.dest_host);
-				js->pub.pbs_pid = e->pBSRun.pid;
+				rep(js->pub.pbs_scheduler, e->PBSRun.scheduler);
+				rep(js->pub.pbs_dest_host, e->PBSRun.dest_host);
+				js->pub.pbs_pid = e->PBSRun.pid;
 			}
 			break;
 		case EDG_WLL_EVENT_PBSDONE:
@@ -101,7 +101,7 @@ int processEvent_PBS(intJobStat *js, edg_wll_Event *e, int ev_seq, int strict, c
 				rep(js->pub.pbs_state, "C");
 			}
 			if (USABLE_DATA(res)) {
-				js->pub.pbs_exit_status =  e->pBSDone.exit_status;	
+				js->pub.pbs_exit_status =  e->PBSDone.exit_status;	
 			}
 			break;
 		default:
diff --git a/org.glite.lb.server/src/store.c.T b/org.glite.lb.server/src/store.c.T
index 1f4fcd3..2012b32 100644
--- a/org.glite.lb.server/src/store.c.T
+++ b/org.glite.lb.server/src/store.c.T
@@ -333,6 +333,7 @@ static int store_flesh(edg_wll_Context ctx,edg_wll_Event *e,char *jobid,int no)
 		selectType $event $type;
 		my $uctype = uc $type;
 		my $flctype = lcfirst $type;
+		if ($flctype =~ m/^pBS/) { $flctype = ucfirst $flctype; }
 		gen qq{
 !		case EDG_WLL_EVENT_$uctype:
 };
diff --git a/org.glite.lb.server/src/ws_typeref.c.T b/org.glite.lb.server/src/ws_typeref.c.T
index 9106493..425a8bd 100644
--- a/org.glite.lb.server/src/ws_typeref.c.T
+++ b/org.glite.lb.server/src/ws_typeref.c.T
@@ -22,6 +22,7 @@ sub eventFieldAssign {
 
 	$tn = $f->{type};
 	$native_en = lcfirst $e;
+	if ($native_en =~ m/^pBS/) { $native_en = ucfirst $native_en; }
 	$native_fn = $f->{name};
 	$soap_en = $e;
 	while ($soap_en =~ /([[:alpha:]]*)_([[:alpha:]_]*)/) {
@@ -1061,6 +1062,7 @@ static int edg_wll_SoapToEvent(
 					$act = 'any';
 				} else {
 					$act = lcfirst $name;
+					if ($act =~ m/^pBS/) { $act = ucfirst $act; }
 				}
 				my $usuc = $fn;
 				$usuc = $1.uc($2).$3 while ($usuc =~ /([^_]*)_([a-z])(.*)/);
diff --git a/org.glite.lb.server/test/test_xml.cpp.T b/org.glite.lb.server/test/test_xml.cpp.T
index d52cd61..775d12a 100644
--- a/org.glite.lb.server/test/test_xml.cpp.T
+++ b/org.glite.lb.server/test/test_xml.cpp.T
@@ -46,6 +46,7 @@ static char * compare_events(const edg_wll_Event *e1, const edg_wll_Event *e2)
 	{
 		my $tu = uc $t;
 		my $tl = lcfirst $t;
+		if ($tl =~ m/^pBS/) { $tl = ucfirst $tl; }
 
 		selectType $event $t;
 		gen "\t\tcase EDG_WLL_EVENT\_$tu :\n";