@@ -501,15 +501,10 @@ impl Object {
501
501
pub struct URL {
502
502
pub url : String ,
503
503
baseClass : String ,
504
- cmdClass : Option < String > ,
505
- cmdNode : Option < String > ,
506
504
pub cmd : Option < String > ,
507
- forwardCmd : Option < String > ,
508
505
pub thr_pk : Option < String > ,
509
- pos_pk : Option < String > ,
510
506
pub ref_id : String ,
511
507
target : Option < String > ,
512
- file : Option < String > ,
513
508
}
514
509
515
510
#[ allow( non_snake_case) ]
@@ -518,15 +513,10 @@ impl URL {
518
513
URL {
519
514
url,
520
515
baseClass : String :: new ( ) ,
521
- cmdClass : None ,
522
- cmdNode : None ,
523
516
cmd : None ,
524
- forwardCmd : None ,
525
517
thr_pk : None ,
526
- pos_pk : None ,
527
518
ref_id : String :: new ( ) ,
528
519
target : None ,
529
- file : None ,
530
520
}
531
521
}
532
522
@@ -537,42 +527,27 @@ impl URL {
537
527
Url :: parse ( href) ?
538
528
} ;
539
529
let mut baseClass = String :: new ( ) ;
540
- let mut cmdClass = None ;
541
- let mut cmdNode = None ;
542
530
let mut cmd = None ;
543
- let mut forwardCmd = None ;
544
531
let mut thr_pk = None ;
545
- let mut pos_pk = None ;
546
532
let mut ref_id = String :: new ( ) ;
547
533
let mut target = None ;
548
- let mut file = None ;
549
534
for ( k, v) in url. query_pairs ( ) {
550
535
match & * k {
551
536
"baseClass" => baseClass = v. into_owned ( ) ,
552
- "cmdClass" => cmdClass = Some ( v. into_owned ( ) ) ,
553
- "cmdNode" => cmdNode = Some ( v. into_owned ( ) ) ,
554
537
"cmd" => cmd = Some ( v. into_owned ( ) ) ,
555
- "forwardCmd" => forwardCmd = Some ( v. into_owned ( ) ) ,
556
538
"thr_pk" => thr_pk = Some ( v. into_owned ( ) ) ,
557
- "pos_pk" => pos_pk = Some ( v. into_owned ( ) ) ,
558
539
"ref_id" => ref_id = v. into_owned ( ) ,
559
540
"target" => target = Some ( v. into_owned ( ) ) ,
560
- "file" => file = Some ( v. into_owned ( ) ) ,
561
541
_ => { } ,
562
542
}
563
543
}
564
544
Ok ( URL {
565
545
url : url. into ( ) ,
566
546
baseClass,
567
- cmdClass,
568
- cmdNode,
569
547
cmd,
570
- forwardCmd,
571
548
thr_pk,
572
- pos_pk,
573
549
ref_id,
574
550
target,
575
- file,
576
551
} )
577
552
}
578
553
}
0 commit comments